From 86f62a00638de5c212c3159a29a2633064ae69e0 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Fri, 7 Apr 2023 05:47:39 -0700
Subject: [PATCH] [BP CLEANUP] Format bpfmt -s in system/*

Test: Build + Th + boot | This should be a no-op change
Bug: 277168419
Change-Id: I09623a2256170a3315ed18d6f9070b428a3cd904
---
 system/Android.bp                             |  24 +-
 system/audio_a2dp_hw/Android.bp               |   4 +-
 system/audio_bluetooth_hw/Android.bp          |   4 +-
 system/audio_hal_interface/Android.bp         |  20 +-
 system/audio_hal_interface/fuzzer/Android.bp  |  60 ++---
 system/audio_hearing_aid_hw/Android.bp        |   2 +-
 system/binder/Android.bp                      |  36 +--
 system/bta/Android.bp                         | 228 +++++++++---------
 system/btcore/Android.bp                      |   4 +-
 system/btcore/fuzzer/Android.bp               |  20 +-
 system/btif/Android.bp                        |  84 +++----
 system/build/Android.bp                       |  56 ++---
 system/common/Android.bp                      |  30 +--
 system/device/Android.bp                      |  20 +-
 system/device/fuzzer/Android.bp               |   6 +-
 system/embdrv/encoder_for_aptx/Android.bp     |   4 +-
 system/embdrv/encoder_for_aptxhd/Android.bp   |   4 +-
 system/embdrv/lc3/Android.bp                  |  10 +-
 system/embdrv/sbc/decoder/Android.bp          |   8 +-
 system/embdrv/tests/Android.bp                |   4 +-
 system/hci/Android.bp                         |  16 +-
 system/main/Android.bp                        |  60 ++---
 system/packet/Android.bp                      |  10 +-
 system/packet/base/Android.bp                 |   2 +-
 system/packet/tests/fuzzers/Android.bp        | 150 ++++++------
 system/profile/avrcp/Android.bp               |  28 +--
 system/profile/sdp/Android.bp                 |  12 +-
 system/rust/Android.bp                        |  18 +-
 system/test/Android.bp                        |  28 +--
 system/test/headless/Android.bp               |  32 +--
 system/test/rootcanal/Android.bp              |  10 +-
 system/test/suite/Android.bp                  |  28 +--
 system/types/Android.bp                       |   6 +-
 system/vendor_libs/linux/interface/Android.bp |   8 +-
 34 files changed, 518 insertions(+), 518 deletions(-)

diff --git a/system/Android.bp b/system/Android.bp
index 657f6adacc7..481a55a63d5 100644
--- a/system/Android.bp
+++ b/system/Android.bp
@@ -14,19 +14,19 @@ filegroup {
     name: "BlueberryFacadeProto",
     srcs: [
         "blueberry/facade/common.proto",
-        "blueberry/facade/rootservice.proto",
         "blueberry/facade/hal/hal_facade.proto",
-        "blueberry/facade/hci/hci_facade.proto",
         "blueberry/facade/hci/acl_manager_facade.proto",
         "blueberry/facade/hci/controller_facade.proto",
+        "blueberry/facade/hci/hci_facade.proto",
         "blueberry/facade/hci/le_acl_manager_facade.proto",
         "blueberry/facade/hci/le_advertising_manager_facade.proto",
         "blueberry/facade/hci/le_initiator_address_facade.proto",
         "blueberry/facade/hci/le_scanning_manager_facade.proto",
         "blueberry/facade/iso/facade.proto",
-        "blueberry/facade/neighbor/facade.proto",
         "blueberry/facade/l2cap/classic/facade.proto",
         "blueberry/facade/l2cap/le/facade.proto",
+        "blueberry/facade/neighbor/facade.proto",
+        "blueberry/facade/rootservice.proto",
         "blueberry/facade/security/facade.proto",
         "blueberry/facade/shim/facade.proto",
         "blueberry/facade/topshim/facade.proto",
@@ -46,16 +46,14 @@ genrule {
     out: [
         "blueberry/facade/common.grpc.pb.h",
         "blueberry/facade/common.pb.h",
-        "blueberry/facade/rootservice.grpc.pb.h",
-        "blueberry/facade/rootservice.pb.h",
         "blueberry/facade/hal/hal_facade.grpc.pb.h",
         "blueberry/facade/hal/hal_facade.pb.h",
-        "blueberry/facade/hci/hci_facade.grpc.pb.h",
-        "blueberry/facade/hci/hci_facade.pb.h",
         "blueberry/facade/hci/acl_manager_facade.grpc.pb.h",
         "blueberry/facade/hci/acl_manager_facade.pb.h",
         "blueberry/facade/hci/controller_facade.grpc.pb.h",
         "blueberry/facade/hci/controller_facade.pb.h",
+        "blueberry/facade/hci/hci_facade.grpc.pb.h",
+        "blueberry/facade/hci/hci_facade.pb.h",
         "blueberry/facade/hci/le_acl_manager_facade.grpc.pb.h",
         "blueberry/facade/hci/le_acl_manager_facade.pb.h",
         "blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.h",
@@ -72,6 +70,8 @@ genrule {
         "blueberry/facade/l2cap/le/facade.pb.h",
         "blueberry/facade/neighbor/facade.grpc.pb.h",
         "blueberry/facade/neighbor/facade.pb.h",
+        "blueberry/facade/rootservice.grpc.pb.h",
+        "blueberry/facade/rootservice.pb.h",
         "blueberry/facade/security/facade.grpc.pb.h",
         "blueberry/facade/security/facade.pb.h",
         "blueberry/facade/shim/facade.grpc.pb.h",
@@ -92,16 +92,14 @@ genrule {
     out: [
         "blueberry/facade/common.grpc.pb.cc",
         "blueberry/facade/common.pb.cc",
-        "blueberry/facade/rootservice.grpc.pb.cc",
-        "blueberry/facade/rootservice.pb.cc",
         "blueberry/facade/hal/hal_facade.grpc.pb.cc",
         "blueberry/facade/hal/hal_facade.pb.cc",
-        "blueberry/facade/hci/hci_facade.grpc.pb.cc",
-        "blueberry/facade/hci/hci_facade.pb.cc",
         "blueberry/facade/hci/acl_manager_facade.grpc.pb.cc",
         "blueberry/facade/hci/acl_manager_facade.pb.cc",
         "blueberry/facade/hci/controller_facade.grpc.pb.cc",
         "blueberry/facade/hci/controller_facade.pb.cc",
+        "blueberry/facade/hci/hci_facade.grpc.pb.cc",
+        "blueberry/facade/hci/hci_facade.pb.cc",
         "blueberry/facade/hci/le_acl_manager_facade.grpc.pb.cc",
         "blueberry/facade/hci/le_acl_manager_facade.pb.cc",
         "blueberry/facade/hci/le_advertising_manager_facade.grpc.pb.cc",
@@ -118,6 +116,8 @@ genrule {
         "blueberry/facade/l2cap/le/facade.pb.cc",
         "blueberry/facade/neighbor/facade.grpc.pb.cc",
         "blueberry/facade/neighbor/facade.pb.cc",
+        "blueberry/facade/rootservice.grpc.pb.cc",
+        "blueberry/facade/rootservice.pb.cc",
         "blueberry/facade/security/facade.grpc.pb.cc",
         "blueberry/facade/security/facade.pb.cc",
         "blueberry/facade/shim/facade.grpc.pb.cc",
@@ -147,9 +147,9 @@ rust_protobuf {
     crate_name: "bt_facade_proto",
     protos: ["blueberry/facade/common.proto"],
     grpc_protos: [
+        "blueberry/facade/hal/hal_facade.proto",
         "blueberry/facade/hci/controller_facade.proto",
         "blueberry/facade/hci/hci_facade.proto",
-        "blueberry/facade/hal/hal_facade.proto",
         "blueberry/facade/rootservice.proto",
     ],
     source_stem: "facade",
diff --git a/system/audio_a2dp_hw/Android.bp b/system/audio_a2dp_hw/Android.bp
index e1f1ad8f35e..0c72f1fb82c 100644
--- a/system/audio_a2dp_hw/Android.bp
+++ b/system/audio_a2dp_hw/Android.bp
@@ -32,8 +32,8 @@ cc_library {
         "com.android.btservices",
     ],
     shared_libs: [
-        "liblog",
         "libcutils",
+        "liblog",
     ],
     static_libs: [
         "libbluetooth_gd",
@@ -60,8 +60,8 @@ cc_test {
     test_suites: ["device-tests"],
     defaults: [
         "audio_a2dp_hw_defaults",
-        "mts_defaults",
         "bluetooth_gtest_x86_asan_workaround",
+        "mts_defaults",
     ],
     srcs: [
         "test/audio_a2dp_hw_test.cc",
diff --git a/system/audio_bluetooth_hw/Android.bp b/system/audio_bluetooth_hw/Android.bp
index 354f89a660c..5e2e16876bb 100644
--- a/system/audio_bluetooth_hw/Android.bp
+++ b/system/audio_bluetooth_hw/Android.bp
@@ -25,18 +25,18 @@ cc_library_shared {
     proprietary: true,
     srcs: [
         "audio_bluetooth_hw.cc",
-        "stream_apis.cc",
         "device_port_proxy.cc",
         "device_port_proxy_hidl.cc",
+        "stream_apis.cc",
         "utils.cc",
     ],
     header_libs: ["libhardware_headers"],
     shared_libs: [
         "android.hardware.bluetooth.audio-V3-ndk",
-        "libbluetooth_audio_session_aidl",
         "libaudioutils",
         "libbase",
         "libbinder_ndk",
+        "libbluetooth_audio_session_aidl",
         "libcutils",
         "libfmq",
         "liblog",
diff --git a/system/audio_hal_interface/Android.bp b/system/audio_hal_interface/Android.bp
index 7ba1bb5ec84..183276495de 100644
--- a/system/audio_hal_interface/Android.bp
+++ b/system/audio_hal_interface/Android.bp
@@ -13,12 +13,12 @@ cc_library_static {
     defaults: ["fluoride_defaults"],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
         "packages/modules/Bluetooth/system/btif/include",
-        "packages/modules/Bluetooth/system/stack/include",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/gd/rust/shim",
+        "packages/modules/Bluetooth/system/stack/include",
     ],
     shared_libs: [
         "android.hardware.bluetooth.audio@2.0",
@@ -26,40 +26,40 @@ cc_library_static {
         "libhidlbase",
     ],
     static_libs: [
-        "libosi",
         "libbt-common",
+        "libosi",
     ],
     target: {
         android: {
             shared_libs: [
-                "libfmq",
-                "libbinder_ndk",
                 "android.hardware.bluetooth.audio-V3-ndk",
+                "libbinder_ndk",
+                "libfmq",
             ],
             srcs: [
+                "a2dp_encoding.cc",
                 "aidl/a2dp_encoding_aidl.cc",
                 "aidl/bluetooth_audio_port_impl.cc",
                 "aidl/client_interface_aidl.cc",
                 "aidl/codec_status_aidl.cc",
                 "aidl/hearing_aid_software_encoding_aidl.cc",
                 "aidl/le_audio_software_aidl.cc",
+                "hal_version_manager.cc",
+                "hearing_aid_software_encoding.cc",
                 "hidl/a2dp_encoding_hidl.cc",
                 "hidl/client_interface_hidl.cc",
                 "hidl/codec_status_hidl.cc",
                 "hidl/hearing_aid_software_encoding_hidl.cc",
                 "hidl/le_audio_software_hidl.cc",
-                "a2dp_encoding.cc",
-                "hearing_aid_software_encoding.cc",
                 "le_audio_software.cc",
-                "hal_version_manager.cc",
             ],
         },
         host: {
             srcs: [
                 "a2dp_encoding_host.cc",
+                "hal_version_manager_host.cc",
                 "hearing_aid_software_encoding_host.cc",
                 "le_audio_software_host.cc",
-                "hal_version_manager_host.cc",
             ],
         },
     },
@@ -86,9 +86,9 @@ cc_test {
         "hidl/client_interface_hidl_unittest.cc",
     ],
     shared_libs: [
+        "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
-        "android.hardware.bluetooth.audio-V3-ndk",
         "libbinder_ndk",
         "libcutils",
         "libfmq",
diff --git a/system/audio_hal_interface/fuzzer/Android.bp b/system/audio_hal_interface/fuzzer/Android.bp
index ae57c74ffa8..6d07b5e2031 100644
--- a/system/audio_hal_interface/fuzzer/Android.bp
+++ b/system/audio_hal_interface/fuzzer/Android.bp
@@ -47,56 +47,56 @@ cc_defaults {
         "android.system.suspend-V1-ndk",
     ],
     static_libs: [
-        "libbte",
-        "liblog",
-        "libosi",
-        "libbtif",
-        "libbtif-core",
+        "libFraunhoferAAC",
+        "libaudio-a2dp-hw-utils",
         "libbase",
-        "libutils",
-        "libevent",
-        "libcutils",
-        "libchrome",
-        "libbtcore",
+        "libbluetooth-dumpsys",
+        "libbluetooth-protos",
+        "libbluetooth-types",
+        "libbluetooth_gd",
+        "libbluetooth_rust_interop",
+        "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
+        "libbt-common",
         "libbt-hci",
+        "libbt-sbc-decoder",
+        "libbt-sbc-encoder",
+        "libbt-stack",
+        "libbt-stack-core",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
-        "libjsoncpp",
+        "libbtcore",
         "libbtdevice",
+        "libbte",
+        "libbtif",
+        "libbtif-core",
         "libcgrouprc",
+        "libcgrouprc_format",
+        "libchrome",
+        "libcutils",
+        "libevent",
         "libflatbuffers-cpp",
-        "libhidlbase",
-        "libbt-stack",
-        "libbt-stack-core",
         "libg722codec",
-        "libudrv-uipc",
-        "libbt-common",
+        "libhidlbase",
+        "libjsoncpp",
         "liblc3",
+        "liblog",
         "libopus",
+        "libosi",
+        "libprotobuf-cpp-lite",
         "libstatslog_bt",
+        "libudrv-uipc",
+        "libutils",
         "libvndksupport",
-        "libbluetooth_gd",
-        "libFraunhoferAAC",
-        "libbt-sbc-decoder",
-        "libbt-sbc-encoder",
-        "libcgrouprc_format",
-        "libbluetooth-types",
-        "libbluetooth-protos",
-        "libbluetooth-dumpsys",
-        "libprotobuf-cpp-lite",
-        "libbt-audio-hal-interface",
-        "libbluetooth_rust_interop",
-        "libaudio-a2dp-hw-utils",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/btif",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/stack/include",
-        "packages/modules/Bluetooth/system/bta/include",
     ],
     cflags: [
         // http://b/264549607
diff --git a/system/audio_hearing_aid_hw/Android.bp b/system/audio_hearing_aid_hw/Android.bp
index 3d6a30b0505..79c29b89690 100644
--- a/system/audio_hearing_aid_hw/Android.bp
+++ b/system/audio_hearing_aid_hw/Android.bp
@@ -42,8 +42,8 @@ cc_test {
     test_suites: ["device-tests"],
     defaults: [
         "audio_hearing_aid_hw_defaults",
-        "mts_defaults",
         "bluetooth_gtest_x86_asan_workaround",
+        "mts_defaults",
     ],
     srcs: [
         "test/audio_hearing_aid_hw_test.cc",
diff --git a/system/binder/Android.bp b/system/binder/Android.bp
index 5388d19cf6f..a9dbadbdc93 100644
--- a/system/binder/Android.bp
+++ b/system/binder/Android.bp
@@ -25,51 +25,51 @@ filegroup {
         "android/bluetooth/IBluetoothAvrcpTarget.aidl",
         "android/bluetooth/IBluetoothBattery.aidl",
         "android/bluetooth/IBluetoothCallback.aidl",
+        "android/bluetooth/IBluetoothConnectionCallback.aidl",
         "android/bluetooth/IBluetoothCsipSetCoordinator.aidl",
         "android/bluetooth/IBluetoothCsipSetCoordinatorCallback.aidl",
         "android/bluetooth/IBluetoothCsipSetCoordinatorLockCallback.aidl",
-        "android/bluetooth/IBluetoothProfileServiceConnection.aidl",
-        "android/bluetooth/IBluetoothHeadset.aidl",
-        "android/bluetooth/IBluetoothHearingAid.aidl",
+        "android/bluetooth/IBluetoothGatt.aidl",
+        "android/bluetooth/IBluetoothGattCallback.aidl",
+        "android/bluetooth/IBluetoothGattServerCallback.aidl",
         "android/bluetooth/IBluetoothHapClient.aidl",
         "android/bluetooth/IBluetoothHapClientCallback.aidl",
-        "android/bluetooth/IBluetoothVolumeControl.aidl",
-        "android/bluetooth/IBluetoothVolumeControlCallback.aidl",
+        "android/bluetooth/IBluetoothHeadset.aidl",
+        "android/bluetooth/IBluetoothHeadsetClient.aidl",
+        "android/bluetooth/IBluetoothHearingAid.aidl",
+        "android/bluetooth/IBluetoothHidDevice.aidl",
+        "android/bluetooth/IBluetoothHidDeviceCallback.aidl",
         "android/bluetooth/IBluetoothHidHost.aidl",
         "android/bluetooth/IBluetoothLeAudio.aidl",
         "android/bluetooth/IBluetoothLeAudioCallback.aidl",
+        "android/bluetooth/IBluetoothLeBroadcastAssistant.aidl",
+        "android/bluetooth/IBluetoothLeBroadcastAssistantCallback.aidl",
         "android/bluetooth/IBluetoothLeBroadcastCallback.aidl",
+        "android/bluetooth/IBluetoothLeCallControl.aidl",
+        "android/bluetooth/IBluetoothLeCallControlCallback.aidl",
         "android/bluetooth/IBluetoothManager.aidl",
         "android/bluetooth/IBluetoothManagerCallback.aidl",
         "android/bluetooth/IBluetoothMap.aidl",
         "android/bluetooth/IBluetoothMapClient.aidl",
         "android/bluetooth/IBluetoothMcpServiceManager.aidl",
+        "android/bluetooth/IBluetoothMetadataListener.aidl",
+        "android/bluetooth/IBluetoothOobDataCallback.aidl",
         "android/bluetooth/IBluetoothPan.aidl",
         "android/bluetooth/IBluetoothPanCallback.aidl",
         "android/bluetooth/IBluetoothPbap.aidl",
         "android/bluetooth/IBluetoothPbapClient.aidl",
         "android/bluetooth/IBluetoothPreferredAudioProfilesCallback.aidl",
+        "android/bluetooth/IBluetoothProfileServiceConnection.aidl",
         "android/bluetooth/IBluetoothQualityReportReadyCallback.aidl",
         "android/bluetooth/IBluetoothSap.aidl",
         "android/bluetooth/IBluetoothSocketManager.aidl",
         "android/bluetooth/IBluetoothStateChangeCallback.aidl",
-        "android/bluetooth/IBluetoothHeadsetClient.aidl",
-        "android/bluetooth/IBluetoothHidDevice.aidl",
-        "android/bluetooth/IBluetoothHidDeviceCallback.aidl",
-        "android/bluetooth/IBluetoothGatt.aidl",
-        "android/bluetooth/IBluetoothGattCallback.aidl",
-        "android/bluetooth/IBluetoothMetadataListener.aidl",
-        "android/bluetooth/IBluetoothGattServerCallback.aidl",
-        "android/bluetooth/IBluetoothOobDataCallback.aidl",
-        "android/bluetooth/IBluetoothLeCallControl.aidl",
-        "android/bluetooth/IBluetoothLeCallControlCallback.aidl",
+        "android/bluetooth/IBluetoothVolumeControl.aidl",
+        "android/bluetooth/IBluetoothVolumeControlCallback.aidl",
         "android/bluetooth/IncomingRfcommSocketInfo.aidl",
         "android/bluetooth/le/IAdvertisingSetCallback.aidl",
         "android/bluetooth/le/IDistanceMeasurementCallback.aidl",
         "android/bluetooth/le/IPeriodicAdvertisingCallback.aidl",
         "android/bluetooth/le/IScannerCallback.aidl",
-        "android/bluetooth/IBluetoothConnectionCallback.aidl",
-        "android/bluetooth/IBluetoothLeBroadcastAssistantCallback.aidl",
-        "android/bluetooth/IBluetoothLeBroadcastAssistant.aidl",
     ],
 }
diff --git a/system/bta/Android.bp b/system/bta/Android.bp
index 3a72dafe862..f6f2c12d6ec 100644
--- a/system/bta/Android.bp
+++ b/system/bta/Android.bp
@@ -11,11 +11,11 @@ cc_defaults {
     name: "fluoride_bta_defaults",
     defaults: ["fluoride_basic_defaults"],
     local_include_dirs: [
-        "include",
-        "sys",
         "dm",
         "hd",
         "hh",
+        "include",
+        "sys",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
@@ -23,12 +23,12 @@ cc_defaults {
         "packages/modules/Bluetooth/system/btif/avrcp",
         "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/internal_include",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/btm",
+        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/udrv/include",
         "packages/modules/Bluetooth/system/vnd/include",
-        "packages/modules/Bluetooth/system/gd/rust/shim",
     ],
     header_libs: ["libbluetooth_headers"],
     generated_headers: [
@@ -73,32 +73,14 @@ cc_library_static {
         "av/bta_av_ssm.cc",
         "csis/csis_client.cc",
         "groups/groups.cc",
-        "vc/device.cc",
-        "vc/vc.cc",
-        "le_audio/broadcaster/broadcaster.cc",
-        "le_audio/broadcaster/broadcaster_types.cc",
-        "le_audio/broadcaster/state_machine.cc",
-        "le_audio/client.cc",
-        "le_audio/codec_manager.cc",
-        "le_audio/content_control_id_keeper.cc",
-        "le_audio/devices.cc",
-        "le_audio/hal_verifier.cc",
-        "le_audio/state_machine.cc",
-        "le_audio/storage_helper.cc",
-        "le_audio/client_parser.cc",
-        "le_audio/audio_hal_client/audio_sink_hal_client.cc",
-        "le_audio/audio_hal_client/audio_source_hal_client.cc",
-        "le_audio/le_audio_log_history.cc",
-        "le_audio/le_audio_utils.cc",
-        "le_audio/le_audio_set_configuration_provider.cc",
-        "le_audio/le_audio_set_configuration_provider_json.cc",
-        "le_audio/le_audio_types.cc",
-        "le_audio/metrics_collector.cc",
         "has/has_client.cc",
         "has/has_ctp.cc",
         "has/has_journal.cc",
         "has/has_preset.cc",
         "has/has_types.cc",
+        "hd/bta_hd_act.cc",
+        "hd/bta_hd_api.cc",
+        "hd/bta_hd_main.cc",
         "hearing_aid/hearing_aid.cc",
         "hearing_aid/hearing_aid_audio_source.cc",
         "hf_client/bta_hf_client_act.cc",
@@ -108,20 +90,38 @@ cc_library_static {
         "hf_client/bta_hf_client_rfc.cc",
         "hf_client/bta_hf_client_sco.cc",
         "hf_client/bta_hf_client_sdp.cc",
+        "hfp/bta_hfp_api.cc",
         "hh/bta_hh_act.cc",
         "hh/bta_hh_api.cc",
         "hh/bta_hh_cfg.cc",
         "hh/bta_hh_le.cc",
         "hh/bta_hh_main.cc",
         "hh/bta_hh_utils.cc",
-        "hfp/bta_hfp_api.cc",
-        "hd/bta_hd_act.cc",
-        "hd/bta_hd_api.cc",
-        "hd/bta_hd_main.cc",
+        "le_audio/audio_hal_client/audio_sink_hal_client.cc",
+        "le_audio/audio_hal_client/audio_source_hal_client.cc",
+        "le_audio/broadcaster/broadcaster.cc",
+        "le_audio/broadcaster/broadcaster_types.cc",
+        "le_audio/broadcaster/state_machine.cc",
+        "le_audio/client.cc",
+        "le_audio/client_parser.cc",
+        "le_audio/codec_manager.cc",
+        "le_audio/content_control_id_keeper.cc",
+        "le_audio/devices.cc",
+        "le_audio/hal_verifier.cc",
+        "le_audio/le_audio_log_history.cc",
+        "le_audio/le_audio_set_configuration_provider.cc",
+        "le_audio/le_audio_set_configuration_provider_json.cc",
+        "le_audio/le_audio_types.cc",
+        "le_audio/le_audio_utils.cc",
+        "le_audio/metrics_collector.cc",
+        "le_audio/state_machine.cc",
+        "le_audio/storage_helper.cc",
         "pan/bta_pan_act.cc",
         "pan/bta_pan_api.cc",
         "pan/bta_pan_ci.cc",
         "pan/bta_pan_main.cc",
+        "vc/device.cc",
+        "vc/vc.cc",
     ],
     cflags: [
         /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
@@ -186,16 +186,16 @@ cc_library_static {
 cc_test {
     name: "net_test_bta",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     srcs: [
-        ":TestMockBtif",
-        ":TestMockStackBtm",
         ":TestCommonLogMsg",
         ":TestCommonMockFunctions",
+        ":TestMockBtif",
+        ":TestMockStackBtm",
         "test/bta_dip_test.cc",
         "test/bta_dm_cust_uuid_test.cc",
         "test/bta_hf_client_add_record_test.cc",
@@ -212,30 +212,30 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
-        "libbtcore",
+        "libbluetooth-types",
+        "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
-        "libbt-audio-hal-interface",
-        "libbluetooth-types",
+        "libbt-common",
         "libbt-protos-lite",
+        "libbtcore",
         "libcom.android.sysprop.bluetooth",
         "libosi",
-        "libbt-common",
     ],
     data: [
-        ":audio_set_scenarios_bfbs",
-        ":audio_set_scenarios_json",
         ":audio_set_configurations_bfbs",
         ":audio_set_configurations_json",
+        ":audio_set_scenarios_bfbs",
+        ":audio_set_scenarios_json",
     ],
 }
 
 cc_test {
     name: "bt_host_test_bta",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     host_supported: true,
@@ -291,8 +291,8 @@ cc_test {
         "sys/bta_sys_conn.cc",
         "sys/bta_sys_main.cc",
         "sys/utl.cc",
-        "test/bta_av_test.cc",
         "test/bta_api_test.cc",
+        "test/bta_av_test.cc",
         "test/bta_dm_test.cc",
         "test/bta_gatt_test.cc",
         "test/bta_pan_test.cc",
@@ -305,10 +305,10 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
-        "libbtdevice",
         "libbt-common",
         "libbt-protos-lite",
         "libbtcore",
+        "libbtdevice",
         "libcom.android.sysprop.bluetooth",
         "libflatbuffers-cpp",
         "libgmock",
@@ -325,10 +325,10 @@ cc_test {
     name: "bluetooth_csis_test",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     include_dirs: [
@@ -345,9 +345,9 @@ cc_test {
         ":TestMockMainShimLeScanning",
         "csis/csis_client.cc",
         "csis/csis_client_test.cc",
-        "groups/groups.cc",
         "gatt/database.cc",
         "gatt/database_builder.cc",
+        "groups/groups.cc",
         "test/common/bta_dm_api_mock.cc",
         "test/common/bta_gatt_api_mock.cc",
         "test/common/bta_gatt_queue_mock.cc",
@@ -358,9 +358,9 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
+        "libgmock",
         "libosi",
     ],
     sanitize: {
@@ -380,10 +380,10 @@ cc_test {
     name: "bluetooth_groups_test",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     include_dirs: [
@@ -393,17 +393,17 @@ cc_test {
     srcs: [
         ":TestCommonMockFunctions",
         ":TestMockBtif",
-        "groups/groups_test.cc",
         "groups/groups.cc",
+        "groups/groups_test.cc",
     ],
     shared_libs: [
         "libcrypto",
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
+        "libgmock",
         "libosi",
     ],
     sanitize: {
@@ -423,10 +423,10 @@ cc_test {
     name: "bluetooth_vc_test",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     include_dirs: [
@@ -443,10 +443,10 @@ cc_test {
         "gatt/database_builder.cc",
         "test/common/bta_gatt_api_mock.cc",
         "test/common/bta_gatt_queue_mock.cc",
-        "test/common/mock_csis_client.cc",
         "test/common/btm_api_mock.cc",
-        "vc/devices_test.cc",
+        "test/common/mock_csis_client.cc",
         "vc/device.cc",
+        "vc/devices_test.cc",
         "vc/vc.cc",
         "vc/vc_test.cc",
     ],
@@ -455,9 +455,9 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
+        "libgmock",
         "libosi",
     ],
     sanitize: {
@@ -543,10 +543,10 @@ cc_test {
     name: "bluetooth_le_audio_test",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     target: {
@@ -574,12 +574,9 @@ cc_test {
         ":TestCommonMockFunctions",
         ":TestMockBtaLeAudioHalVerifier",
         ":TestStubOsi",
-        "test/common/bta_gatt_api_mock.cc",
-        "test/common/bta_gatt_queue_mock.cc",
-        "test/common/btm_api_mock.cc",
+        "le_audio/audio_hal_client/audio_hal_client_test.cc",
         "le_audio/audio_hal_client/audio_sink_hal_client.cc",
         "le_audio/audio_hal_client/audio_source_hal_client.cc",
-        "le_audio/audio_hal_client/audio_hal_client_test.cc",
         "le_audio/client_parser.cc",
         "le_audio/client_parser_test.cc",
         "le_audio/content_control_id_keeper.cc",
@@ -591,37 +588,40 @@ cc_test {
         "le_audio/le_audio_types.cc",
         "le_audio/le_audio_types_test.cc",
         "le_audio/metrics_collector_linux.cc",
+        "le_audio/mock_codec_manager.cc",
         "le_audio/mock_iso_manager.cc",
-        "test/common/btif_storage_mock.cc",
-        "test/common/mock_controller.cc",
-        "test/common/mock_csis_client.cc",
         "le_audio/state_machine.cc",
         "le_audio/state_machine_test.cc",
         "le_audio/storage_helper.cc",
         "le_audio/storage_helper_test.cc",
-        "le_audio/mock_codec_manager.cc",
+        "test/common/bta_gatt_api_mock.cc",
+        "test/common/bta_gatt_queue_mock.cc",
+        "test/common/btif_storage_mock.cc",
+        "test/common/btm_api_mock.cc",
+        "test/common/mock_controller.cc",
+        "test/common/mock_csis_client.cc",
     ],
     data: [
-        ":audio_set_scenarios_bfbs",
-        ":audio_set_scenarios_json",
         ":audio_set_configurations_bfbs",
         ":audio_set_configurations_json",
+        ":audio_set_scenarios_bfbs",
+        ":audio_set_scenarios_json",
     ],
     generated_headers: [
         "LeAudioSetConfigSchemas_h",
     ],
     shared_libs: [
-        "libcrypto",
-        "liblog", // __android_log_print
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
+        "libcrypto",
         "libhidlbase",
+        "liblog", // __android_log_print
     ],
     static_libs: [
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
         "libflatbuffers-cpp",
+        "libgmock",
         "libosi",
     ],
     sanitize: {
@@ -633,10 +633,10 @@ cc_test {
     name: "bluetooth_le_audio_client_test",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -657,49 +657,49 @@ cc_test {
         "le_audio/client_parser.cc",
         "le_audio/content_control_id_keeper.cc",
         "le_audio/devices.cc",
-        "le_audio/le_audio_log_history.cc",
-        "le_audio/le_audio_utils.cc",
         "le_audio/le_audio_client_test.cc",
+        "le_audio/le_audio_log_history.cc",
         "le_audio/le_audio_set_configuration_provider_json.cc",
         "le_audio/le_audio_types.cc",
+        "le_audio/le_audio_utils.cc",
         "le_audio/metrics_collector.cc",
         "le_audio/metrics_collector_test.cc",
+        "le_audio/mock_codec_manager.cc",
         "le_audio/mock_iso_manager.cc",
         "le_audio/mock_state_machine.cc",
         "le_audio/storage_helper.cc",
-        "test/common/btm_api_mock.cc",
         "test/common/bta_gatt_api_mock.cc",
         "test/common/bta_gatt_queue_mock.cc",
         "test/common/btif_storage_mock.cc",
-        "test/common/mock_csis_client.cc",
+        "test/common/btm_api_mock.cc",
         "test/common/mock_controller.cc",
+        "test/common/mock_csis_client.cc",
         "test/common/mock_device_groups.cc",
-        "le_audio/mock_codec_manager.cc",
     ],
     shared_libs: [
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
-        "libhidlbase",
+        "libbinder_ndk",
         "libcrypto",
-        "liblog",
         "libfmq",
-        "libbinder_ndk",
+        "libhidlbase",
+        "liblog",
     ],
     static_libs: [
-        "libbt-audio-hal-interface",
         "crypto_toolbox_for_tests",
-        "libgmock",
+        "libbt-audio-hal-interface",
         "libbt-common",
         "libbt-protos-lite",
         "libflatbuffers-cpp",
-        "libosi",
+        "libgmock",
         "liblc3",
+        "libosi",
     ],
     data: [
-        ":audio_set_scenarios_bfbs",
-        ":audio_set_scenarios_json",
         ":audio_set_configurations_bfbs",
         ":audio_set_configurations_json",
+        ":audio_set_scenarios_bfbs",
+        ":audio_set_scenarios_json",
     ],
     generated_headers: [
         "LeAudioSetConfigSchemas_h",
@@ -707,8 +707,8 @@ cc_test {
     target: {
         android: {
             shared_libs: [
-                "libbinder_ndk",
                 "android.hardware.bluetooth.audio-V3-ndk",
+                "libbinder_ndk",
             ],
         },
     },
@@ -728,10 +728,10 @@ cc_test {
     name: "bluetooth_test_broadcaster_state_machine",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -741,27 +741,27 @@ cc_test {
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/le_audio",
         "packages/modules/Bluetooth/system/btif/include",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/btm",
+        "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
+        ":TestCommonMockFunctions",
+        ":TestCommonStackConfig",
         "le_audio/broadcaster/broadcaster_types.cc",
         "le_audio/broadcaster/mock_ble_advertising_manager.cc",
         "le_audio/broadcaster/state_machine.cc",
         "le_audio/broadcaster/state_machine_test.cc",
         "le_audio/le_audio_types.cc",
-        "le_audio/mock_iso_manager.cc",
         "le_audio/mock_codec_manager.cc",
-        ":TestCommonMockFunctions",
-        ":TestCommonStackConfig",
+        "le_audio/mock_iso_manager.cc",
     ],
     shared_libs: [
         "libcrypto",
     ],
     static_libs: [
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
+        "libgmock",
         "liblc3",
     ],
     sanitize: {
@@ -780,10 +780,10 @@ cc_test {
     name: "bluetooth_test_broadcaster",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     include_dirs: [
@@ -792,10 +792,12 @@ cc_test {
         "packages/modules/Bluetooth/system/bta/le_audio",
         "packages/modules/Bluetooth/system/bta/test/common",
         "packages/modules/Bluetooth/system/btif/include",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/stack/btm",
+        "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
+        ":TestCommonMockFunctions",
+        ":TestCommonStackConfig",
         ":TestStubOsi",
         "le_audio/broadcaster/broadcaster.cc",
         "le_audio/broadcaster/broadcaster_test.cc",
@@ -803,36 +805,34 @@ cc_test {
         "le_audio/broadcaster/mock_ble_advertising_manager.cc",
         "le_audio/broadcaster/mock_state_machine.cc",
         "le_audio/content_control_id_keeper.cc",
-        "le_audio/le_audio_utils.cc",
         "le_audio/le_audio_types.cc",
+        "le_audio/le_audio_utils.cc",
         "le_audio/metrics_collector_linux.cc",
+        "le_audio/mock_codec_manager.cc",
         "le_audio/mock_iso_manager.cc",
         "test/common/mock_controller.cc",
-        "le_audio/mock_codec_manager.cc",
-        ":TestCommonMockFunctions",
-        ":TestCommonStackConfig",
     ],
     shared_libs: [
-        "libcrypto",
-        "libfmq",
-        "libbinder_ndk",
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
+        "libbinder_ndk",
+        "libcrypto",
+        "libfmq",
         "libhidlbase",
     ],
     static_libs: [
         "libbt-audio-hal-interface",
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
-        "libosi",
+        "libgmock",
         "liblc3",
+        "libosi",
     ],
     target: {
         android: {
             shared_libs: [
-                "libbinder_ndk",
                 "android.hardware.bluetooth.audio-V3-ndk",
+                "libbinder_ndk",
             ],
         },
     },
@@ -852,10 +852,10 @@ cc_test {
     name: "bluetooth_has_test",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -867,6 +867,8 @@ cc_test {
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
+        ":TestCommonMockFunctions",
+        ":TestStubOsi",
         "gatt/database.cc",
         "gatt/database_builder.cc",
         "has/has_client.cc",
@@ -881,17 +883,15 @@ cc_test {
         "test/common/btm_api_mock.cc",
         "test/common/mock_controller.cc",
         "test/common/mock_csis_client.cc",
-        ":TestCommonMockFunctions",
-        ":TestStubOsi",
     ],
     shared_libs: [
         "libcrypto",
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
+        "libgmock",
     ],
     sanitize: {
         cfi: true,
@@ -909,10 +909,10 @@ cc_test {
     name: "bluetooth_hh_test",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_bta_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_bta_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     // TODO(b/231993739): Reenable isolated:true by deleting the explicit disable below
@@ -924,7 +924,6 @@ cc_test {
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
-        ":TestMockMainShim",
         ":TestCommonLogMsg",
         ":TestCommonMainHandler",
         ":TestCommonMockFunctions",
@@ -933,6 +932,7 @@ cc_test {
         ":TestMockBtaSys",
         ":TestMockBtif",
         ":TestMockDevice",
+        ":TestMockMainShim",
         ":TestMockOsi",
         ":TestMockStack",
         "dm/bta_dm_act.cc",
@@ -954,10 +954,10 @@ cc_test {
     ],
     static_libs: [
         "crypto_toolbox_for_tests",
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
         "libcom.android.sysprop.bluetooth",
+        "libgmock",
         "libosi", // ADDED
     ],
     generated_headers: [
diff --git a/system/btcore/Android.bp b/system/btcore/Android.bp
index 2d9916b7fb2..ae1c0bbef17 100644
--- a/system/btcore/Android.bp
+++ b/system/btcore/Android.bp
@@ -87,9 +87,9 @@ cc_test {
     name: "net_test_btcore",
     test_suites: ["device-tests"],
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     local_include_dirs: ["include"],
     include_dirs: ["packages/modules/Bluetooth/system"],
@@ -103,9 +103,9 @@ cc_test {
         "liblog",
     ],
     static_libs: [
+        "libbtcore",
         "libosi",
         "libosi-AllocationTestHarness",
-        "libbtcore",
     ],
     host_supported: true,
     test_options: {
diff --git a/system/btcore/fuzzer/Android.bp b/system/btcore/fuzzer/Android.bp
index 4ab98e6c06d..ef432946876 100644
--- a/system/btcore/fuzzer/Android.bp
+++ b/system/btcore/fuzzer/Android.bp
@@ -38,22 +38,22 @@ cc_defaults {
         "libstatslog_bt",
     ],
     static_libs: [
-        "libosi",
-        "liblog",
         "libbase",
-        "libevent",
-        "libbtcore",
-        "libchrome",
-        "libmodpb64",
-        "libvndksupport",
-        "libbt-common",
-        "libbluetooth-types",
         "libbluetooth-protos",
-        "libprotobuf-cpp-lite",
+        "libbluetooth-types",
         "libbluetooth_rust_interop",
+        "libbt-common",
         "libbt_callbacks_cxx",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
+        "libbtcore",
+        "libchrome",
+        "libevent",
+        "liblog",
+        "libmodpb64",
+        "libosi",
+        "libprotobuf-cpp-lite",
+        "libvndksupport",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
diff --git a/system/btif/Android.bp b/system/btif/Android.bp
index f8de1686461..c670e9a9a23 100644
--- a/system/btif/Android.bp
+++ b/system/btif/Android.bp
@@ -107,13 +107,12 @@ cc_library_static {
         "src/btif_a2dp_source.cc",
         "src/btif_av.cc",
         "src/btif_csis_client.cc",
-        "src/btif_vc.cc",
         "src/btif_has_client.cc",
+        "src/btif_hd.cc",
         "src/btif_hearing_aid.cc",
         "src/btif_hf.cc",
         "src/btif_hf_client.cc",
         "src/btif_hh.cc",
-        "src/btif_hd.cc",
         "src/btif_iot_config.cc",
         "src/btif_le_audio.cc",
         "src/btif_le_audio_broadcaster.cc",
@@ -121,6 +120,7 @@ cc_library_static {
         "src/btif_profile_queue.cc",
         "src/btif_profile_storage.cc",
         "src/btif_rc.cc",
+        "src/btif_vc.cc",
         "src/profile_log_levels.cc",
     ],
     generated_headers: [
@@ -147,13 +147,13 @@ cc_library_static {
     static_libs: [
         "avrcp-target-service",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libaudio-a2dp-hw-utils",
         "libbt-audio-hal-interface",
         "libbt-stack",
         "libbt-stack-core",
         "libbtif-core",
-        "libaudio-a2dp-hw-utils",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -187,13 +187,14 @@ cc_library_static {
         "src/btif_gatt_test.cc",
         "src/btif_gatt_util.cc",
         "src/btif_iot_config.cc",
+        "src/btif_keystore.cc",
         "src/btif_metrics_logging.cc",
         "src/btif_profile_queue.cc",
         "src/btif_sdp.cc",
         "src/btif_sdp_server.cc",
         "src/btif_sock.cc",
-        "src/btif_sock_rfc.cc",
         "src/btif_sock_l2cap.cc",
+        "src/btif_sock_rfc.cc",
         "src/btif_sock_sco.cc",
         "src/btif_sock_sdp.cc",
         "src/btif_sock_thread.cc",
@@ -201,7 +202,6 @@ cc_library_static {
         "src/btif_storage.cc",
         "src/btif_uid.cc",
         "src/btif_util.cc",
-        "src/btif_keystore.cc",
         "src/stack_manager.cc",
     ],
     generated_headers: [
@@ -225,14 +225,14 @@ cc_library_static {
     static_libs: [
         "lib-bt-packets",
         "lib-bt-packets-base",
+        "libaudio-a2dp-hw-utils",
         "libbt-audio-hal-interface",
         "libbt-stack-core",
-        "libaudio-a2dp-hw-utils",
     ],
     cflags: [
         /* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
-        "-fvisibility=default",
         "-DBUILDCFG",
+        "-fvisibility=default",
     ],
     host_supported: true,
     min_sdk_version: "Tiramisu",
@@ -242,9 +242,9 @@ cc_library_static {
 cc_test {
     name: "net_test_btif",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     include_dirs: btifCommonIncludes,
@@ -253,10 +253,10 @@ cc_test {
     ],
     header_libs: ["libbluetooth_headers"],
     shared_libs: [
-        "android.hardware.bluetooth@1.0",
-        "android.hardware.bluetooth@1.1",
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
+        "android.hardware.bluetooth@1.0",
+        "android.hardware.bluetooth@1.1",
         "libaaudio",
         "libbinder_ndk",
         "libcrypto",
@@ -266,22 +266,22 @@ cc_test {
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
         "android.system.suspend.control-V1-ndk",
+        "libFraunhoferAAC",
         "libbluetooth-types",
         "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
-        "libbtif",
-        "libbtif-core",
         "libbt-common",
-        "libbtcore",
-        "libbtdevice",
         "libbt-hci",
         "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",
         "libbt-stack-core",
-        "libFraunhoferAAC",
+        "libbtcore",
+        "libbtdevice",
+        "libbtif",
+        "libbtif-core",
         "libg722codec",
         "liblc3",
         "libopus",
@@ -311,9 +311,9 @@ cc_test {
 cc_test {
     name: "net_test_btif_profile_queue",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     include_dirs: btifCommonIncludes,
@@ -342,9 +342,9 @@ cc_test {
 cc_test {
     name: "net_test_btif_rc",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     host_supported: true,
@@ -381,9 +381,9 @@ cc_test {
 cc_test {
     name: "net_test_btif_config_cache",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     host_supported: true,
@@ -404,9 +404,9 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-types",
-        "libosi",
-        "libgmock",
         "libc++fs",
+        "libgmock",
+        "libosi",
     ],
     cflags: ["-DBUILDCFG"],
     target: {
@@ -422,9 +422,9 @@ cc_test {
 cc_test {
     name: "net_test_btif_hf_client_service",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     include_dirs: btifCommonIncludes,
@@ -449,9 +449,9 @@ cc_test {
     name: "net_test_btif_hh",
     host_supported: true,
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     include_dirs: [
@@ -480,12 +480,12 @@ cc_test {
         "system/libhwbinder/include",
     ],
     srcs: [
+        ":BtaDmSources",
         ":LibBluetoothSources",
+        ":TestCommonCoreInterface",
         ":TestCommonMainHandler",
         ":TestCommonMockFunctions",
-        ":TestCommonCoreInterface",
         ":TestMockAndroidHardware",
-        ":BtaDmSources",
         ":TestMockBtaAg",
         ":TestMockBtaAr",
         ":TestMockBtaAv",
@@ -504,8 +504,8 @@ cc_test {
         ":TestMockBtaSdp",
         ":TestMockBtaSys",
         ":TestMockBtaVc",
-        ":TestMockBtu",
         ":TestMockBtcore",
+        ":TestMockBtu",
         ":TestMockCommon",
         ":TestMockFrameworks",
         ":TestMockHci",
@@ -534,6 +534,9 @@ cc_test {
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
         "avrcp-target-service",
+        "lib-bt-packets",
+        "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
         "libaudio-a2dp-hw-utils",
         "libbluetooth-types",
         "libbt-audio-hal-interface",
@@ -541,14 +544,11 @@ cc_test {
         "libbt-sbc-encoder",
         "libbt-stack",
         "libbt-stack-core",
+        "libbtdevice",
         "libbtif",
         "libbtif-core",
-        "libbtdevice",
-        "lib-bt-packets",
-        "lib-bt-packets-avrcp",
-        "lib-bt-packets-base",
-        "libcom.android.sysprop.bluetooth",
         "libc++fs",
+        "libcom.android.sysprop.bluetooth",
         "libflatbuffers-cpp",
         "libgmock",
     ],
@@ -556,8 +556,8 @@ cc_test {
     target: {
         android: {
             shared_libs: [
-                "libbinder_ndk",
                 "android.hardware.bluetooth.audio-V3-ndk",
+                "libbinder_ndk",
             ],
         },
     },
@@ -573,9 +573,9 @@ cc_test {
     name: "net_test_btif_stack",
     host_supported: true,
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     include_dirs: [
@@ -604,13 +604,13 @@ cc_test {
         "system/libhwbinder/include",
     ],
     srcs: [
+        ":BtaDmSources",
         ":LibBluetoothSources",
         ":OsiCompatSources",
+        ":TestCommonCoreInterface",
         ":TestCommonMainHandler",
         ":TestCommonMockFunctions",
-        ":TestCommonCoreInterface",
         ":TestMockAndroidHardware",
-        ":BtaDmSources",
         ":TestMockBtaAg",
         ":TestMockBtaAr",
         ":TestMockBtaAv",
@@ -629,8 +629,8 @@ cc_test {
         ":TestMockBtaSdp",
         ":TestMockBtaSys",
         ":TestMockBtaVc",
-        ":TestMockBtu",
         ":TestMockBtcore",
+        ":TestMockBtu",
         ":TestMockCommon",
         ":TestMockFrameworks",
         ":TestMockHci",
@@ -659,19 +659,19 @@ cc_test {
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
         "avrcp-target-service",
+        "lib-bt-packets",
+        "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
         "libaudio-a2dp-hw-utils",
         "libbluetooth-types",
         "libbt-audio-hal-interface",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
+        "libbtdevice",
         "libbtif",
         "libbtif-core",
-        "libbtdevice",
-        "lib-bt-packets",
-        "lib-bt-packets-avrcp",
-        "lib-bt-packets-base",
-        "libcom.android.sysprop.bluetooth",
         "libc++fs",
+        "libcom.android.sysprop.bluetooth",
         "libflatbuffers-cpp",
         "libgmock",
     ],
@@ -679,8 +679,8 @@ cc_test {
     target: {
         android: {
             shared_libs: [
-                "libbinder_ndk",
                 "android.hardware.bluetooth.audio-V3-ndk",
+                "libbinder_ndk",
             ],
         },
     },
diff --git a/system/build/Android.bp b/system/build/Android.bp
index d4608ff7e6b..2ba4f9f1114 100644
--- a/system/build/Android.bp
+++ b/system/build/Android.bp
@@ -11,8 +11,8 @@ cc_defaults {
     name: "fluoride_common_options",
     cflags: [
         "-Wall",
-        "-Wextra",
         "-Werror",
+        "-Wextra",
         // there are too many unused parameters in all the code.
         "-Wno-unused-parameter",
         // http://b/264549607
@@ -35,8 +35,8 @@ cc_defaults {
     defaults: ["fluoride_common_options"],
     static_libs: [
         "libchrome",
-        "libmodpb64",
         "libevent",
+        "libmodpb64",
     ],
     shared_libs: [
         "libbase",
@@ -74,9 +74,9 @@ cc_defaults {
     cflags: [
         "-DEXPORT_SYMBOL=__attribute__((visibility(\"default\")))",
         "-fvisibility=hidden",
+        "-DLOG_NDEBUG=1",
         // struct BT_HDR is defined as a variable-size header in a struct.
         "-Wno-gnu-variable-sized-type-not-at-end",
-        "-DLOG_NDEBUG=1",
     ],
     conlyflags: [
         "-std=c99",
@@ -119,15 +119,15 @@ cc_defaults {
         "libbt_callbacks_cxx_headers",
     ],
     generated_headers: [
-        "libbt_shim_bridge_header",
-        "libbt_message_loop_thread_bridge_header",
         "cxx-bridge-header",
+        "libbt_message_loop_thread_bridge_header",
+        "libbt_shim_bridge_header",
     ],
     include_dirs: ["packages/modules/Bluetooth/system/gd/rust/shim"],
     static_libs: [
         "libbluetooth-types",
-        "libbt-platform-protos-lite",
         "libbluetooth_rust_interop",
+        "libbt-platform-protos-lite",
         "libbt_callbacks_cxx",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
@@ -155,11 +155,11 @@ cc_defaults {
     static_libs: [
         "libbt-common",
         "libbt-protos-lite",
+        "libcutils",
+        "libgmock",
         "libosi",
         "libosi-AlarmTestHarness",
         "libosi-AllocationTestHarness",
-        "libcutils",
-        "libgmock",
     ],
     sanitize: {
         address: true,
@@ -187,26 +187,26 @@ cc_defaults {
         "com.android.btservices",
     ],
     shared_libs: [
-        "libcrypto",
         "libbase",
+        "libcrypto",
         "liblog",
         "libnativehelper",
     ],
     static_libs: [
         "android.hardware.bluetooth.a2dp@1.0",
+        "libFraunhoferAAC",
         "libbluetooth-dumpsys",
+        "libbluetooth-types",
         "libbluetooth_gd",
         "libbluetooth_rust_interop",
-        "libbluetooth-types",
-        "libbt_callbacks_cxx",
         "libbt-platform-protos-lite",
         "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
+        "libbt_callbacks_cxx",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
         "libflatbuffers-cpp",
-        "libFraunhoferAAC",
         "libg722codec",
         "liblc3",
         "libopus",
@@ -217,15 +217,15 @@ cc_defaults {
     target: {
         android: {
             shared_libs: [
+                "android.hardware.bluetooth.audio-V3-ndk",
                 "android.hardware.bluetooth.audio@2.0",
                 "android.hardware.bluetooth.audio@2.1",
-                "android.hardware.bluetooth.audio-V3-ndk",
                 "android.system.suspend-V1-ndk",
                 "libaaudio",
                 "libbinder_ndk",
                 "libcutils",
-                "libhidlbase",
                 "libfmq",
+                "libhidlbase",
                 "libtinyxml2",
                 "libutils",
                 "libz",
@@ -240,8 +240,8 @@ cc_defaults {
                 "android.hardware.bluetooth.audio@2.1",
                 "libbinder_ndk",
                 "libcutils",
-                "libhidlbase",
                 "libfmq",
+                "libhidlbase",
                 "libtinyxml2",
                 "libutils",
                 "libz",
@@ -254,24 +254,24 @@ cc_defaults {
     name: "fluoride_full_defaults",
     defaults: ["fluoride_basic_defaults"],
     static_libs: [
-        "libbte",
+        "avrcp-target-service",
+        "lib-bt-packets",
+        "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libaudio-a2dp-hw-utils",
+        "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
         "libbt-common",
-        "libbtdevice",
-        "libbtif",
-        "libbtif-core",
         "libbt-hci",
         "libbt-stack",
         "libbt-stack-core",
         "libbtcore",
+        "libbtdevice",
+        "libbte",
+        "libbtif",
+        "libbtif-core",
         "libosi",
-        "avrcp-target-service",
-        "lib-bt-packets",
-        "libbt-audio-hal-interface",
-        "libaudio-a2dp-hw-utils",
-        "lib-bt-packets-base",
-        "lib-bt-packets-avrcp",
     ],
 }
 
@@ -284,10 +284,10 @@ cc_defaults {
     static_libs: [
         "libbluetooth_gd",
         "libbluetooth_rust_interop",
-        "libbt_shim_ffi",
         "libbt_callbacks_cxx",
         "libbt_shim_bridge",
         "libbt_shim_ffi",
+        "libbt_shim_ffi",
         "libstatslog_bt",
     ],
     target: {
@@ -328,8 +328,8 @@ cc_defaults {
     target: {
         glibc: {
             cflags: [
-                "-fprofile-instr-generate",
                 "-fcoverage-mapping",
+                "-fprofile-instr-generate",
             ],
         },
     },
@@ -346,8 +346,8 @@ cc_defaults {
     target: {
         glibc: {
             ldflags: [
-                "-fprofile-instr-generate",
                 "-fcoverage-mapping",
+                "-fprofile-instr-generate",
             ],
         },
     },
diff --git a/system/common/Android.bp b/system/common/Android.bp
index 157efa7ab83..56562ceedc3 100644
--- a/system/common/Android.bp
+++ b/system/common/Android.bp
@@ -10,15 +10,15 @@ package {
 cc_library_static {
     name: "libbt-common",
     defaults: [
-        "fluoride_basic_defaults",
         "clang_file_coverage",
+        "fluoride_basic_defaults",
     ],
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/gd/rust/shim",
+        "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
         "address_obfuscator.cc",
@@ -27,8 +27,8 @@ cc_library_static {
         "once_timer.cc",
         "os_utils.cc",
         "repeating_timer.cc",
-        "time_util.cc",
         "stop_watch_legacy.cc",
+        "time_util.cc",
     ],
     target: {
         android: {
@@ -45,10 +45,10 @@ cc_test {
     name: "bluetooth_test_common",
     test_suites: ["device-tests"],
     defaults: [
-        "fluoride_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     test_options: {
@@ -57,12 +57,13 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/gd/rust/shim",
+        "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
         "address_obfuscator_unittest.cc",
         "base_bind_unittest.cc",
+        "id_generator_unittest.cc",
         "leaky_bonded_queue_unittest.cc",
         "lru_unittest.cc",
         "message_loop_thread_unittest.cc",
@@ -71,7 +72,6 @@ cc_test {
         "repeating_timer_unittest.cc",
         "state_machine_unittest.cc",
         "time_util_unittest.cc",
-        "id_generator_unittest.cc",
     ],
     target: {
         android: {
@@ -82,10 +82,10 @@ cc_test {
         "libcrypto",
     ],
     static_libs: [
-        "libprotobuf-cpp-lite",
-        "libgmock",
         "libbt-common",
         "libbt-protos-lite",
+        "libgmock",
+        "libprotobuf-cpp-lite",
     ],
     sanitize: {
         cfi: false,
@@ -95,9 +95,9 @@ cc_test {
 cc_test {
     name: "net_test_performance",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     include_dirs: ["packages/modules/Bluetooth/system"],
@@ -111,9 +111,9 @@ cc_test {
         "liblog",
     ],
     static_libs: [
+        "libbt-common",
         "libgmock",
         "libosi",
-        "libbt-common",
     ],
 }
 
@@ -132,8 +132,8 @@ cc_benchmark {
         "liblog",
     ],
     static_libs: [
-        "libosi",
         "libbt-common",
+        "libosi",
     ],
 }
 
@@ -148,15 +148,15 @@ cc_benchmark {
         "benchmark/timer_performance_benchmark.cc",
     ],
     shared_libs: [
-        "liblog",
         "libcrypto",
-        "libprotobuf-cpp-lite",
         "libcrypto",
         "libcutils",
+        "liblog",
+        "libprotobuf-cpp-lite",
     ],
     static_libs: [
-        "libosi",
         "libbt-common",
         "libbt-protos-lite",
+        "libosi",
     ],
 }
diff --git a/system/device/Android.bp b/system/device/Android.bp
index 94611ebf8c2..73f31026cb6 100644
--- a/system/device/Android.bp
+++ b/system/device/Android.bp
@@ -23,10 +23,10 @@ cc_library_static {
     ],
     srcs: [
         "src/controller.cc",
-        "src/esco_parameters.cc",
-        "src/interop.cc",
         "src/device_iot_config.cc",
         "src/device_iot_config_int.cc",
+        "src/esco_parameters.cc",
+        "src/interop.cc",
     ],
     min_sdk_version: "Tiramisu",
 }
@@ -36,9 +36,9 @@ cc_test {
     name: "net_test_device",
     test_suites: ["device-tests"],
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     include_dirs: ["packages/modules/Bluetooth/system"],
@@ -51,11 +51,11 @@ cc_test {
         "liblog",
     ],
     static_libs: [
-        "libbtdevice",
+        "libbluetooth-types",
         "libbtcore",
+        "libbtdevice",
         "libosi",
         "libosi-AllocationTestHarness",
-        "libbluetooth-types",
     ],
 }
 
@@ -64,14 +64,14 @@ cc_test {
     name: "net_test_device_iot_config",
     test_suites: ["device-tests"],
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/device/src",
+        "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
         ":TestCommonMockFunctions",
@@ -81,14 +81,14 @@ cc_test {
     shared_libs: [
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
-        "liblog",
         "libdl",
+        "liblog",
     ],
     static_libs: [
-        "libbtdevice",
+        "libbluetooth-types",
         "libbtcore",
+        "libbtdevice",
         "libgmock",
         "libosi-AllocationTestHarness",
-        "libbluetooth-types",
     ],
 }
diff --git a/system/device/fuzzer/Android.bp b/system/device/fuzzer/Android.bp
index ab9039b07ce..226c36c6541 100644
--- a/system/device/fuzzer/Android.bp
+++ b/system/device/fuzzer/Android.bp
@@ -30,14 +30,14 @@ cc_fuzz {
         "btdevice_esco_fuzzer.cpp",
     ],
     shared_libs: [
-        "liblog",
         "libdl",
+        "liblog",
     ],
     static_libs: [
-        "libbtdevice",
+        "libbluetooth-types",
         "libbtcore",
+        "libbtdevice",
         "libosi",
-        "libbluetooth-types",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
diff --git a/system/embdrv/encoder_for_aptx/Android.bp b/system/embdrv/encoder_for_aptx/Android.bp
index 956b6107efd..406f8e302fd 100644
--- a/system/embdrv/encoder_for_aptx/Android.bp
+++ b/system/embdrv/encoder_for_aptx/Android.bp
@@ -27,15 +27,15 @@ cc_library_static {
     host_supported: true,
     export_include_dirs: ["include"],
     srcs: [
-        "src/aptXbtenc.c",
         "src/ProcessSubband.c",
         "src/QmfConv.c",
         "src/QuantiseDifference.c",
+        "src/aptXbtenc.c",
     ],
     cflags: [
         "-O2",
-        "-Werror",
         "-Wall",
+        "-Werror",
         "-Wextra",
     ],
     tidy: true,
diff --git a/system/embdrv/encoder_for_aptxhd/Android.bp b/system/embdrv/encoder_for_aptxhd/Android.bp
index 652b4ae9d1d..553d87547ca 100644
--- a/system/embdrv/encoder_for_aptxhd/Android.bp
+++ b/system/embdrv/encoder_for_aptxhd/Android.bp
@@ -27,15 +27,15 @@ cc_library_static {
     host_supported: true,
     export_include_dirs: ["include"],
     srcs: [
-        "src/aptXHDbtenc.c",
         "src/ProcessSubband.c",
         "src/QmfConv.c",
         "src/QuantiseDifference.c",
+        "src/aptXHDbtenc.c",
     ],
     cflags: [
         "-O2",
-        "-Werror",
         "-Wall",
+        "-Werror",
         "-Wextra",
     ],
     tidy: true,
diff --git a/system/embdrv/lc3/Android.bp b/system/embdrv/lc3/Android.bp
index 8952144950c..0f6aa61417b 100644
--- a/system/embdrv/lc3/Android.bp
+++ b/system/embdrv/lc3/Android.bp
@@ -20,20 +20,20 @@ cc_library_static {
     ],
     cflags: [
         "-O3",
-        "-ffast-math",
         "-Wmissing-braces",
         "-Wno-#warnings",
-        "-Wuninitialized",
-        "-Wno-self-assign",
         "-Wno-implicit-fallthrough",
+        "-Wno-self-assign",
+        "-Wuninitialized",
+        "-ffast-math",
     ],
     target: {
         android: {
             sanitize: {
                 misc_undefined: [
-                    "unsigned-integer-overflow",
-                    "signed-integer-overflow",
                     "bounds",
+                    "signed-integer-overflow",
+                    "unsigned-integer-overflow",
                 ],
                 cfi: true,
             },
diff --git a/system/embdrv/sbc/decoder/Android.bp b/system/embdrv/sbc/decoder/Android.bp
index b6c8646bb06..e13cec2c3de 100644
--- a/system/embdrv/sbc/decoder/Android.bp
+++ b/system/embdrv/sbc/decoder/Android.bp
@@ -13,19 +13,19 @@ cc_library_static {
     defaults: ["fluoride_defaults"],
     srcs: [
         "srce/alloc.c",
-        "srce/bitalloc.c",
         "srce/bitalloc-sbc.c",
+        "srce/bitalloc.c",
         "srce/bitstream-decode.c",
         "srce/decoder-oina.c",
         "srce/decoder-private.c",
         "srce/decoder-sbc.c",
         "srce/dequant.c",
-        "srce/framing.c",
         "srce/framing-sbc.c",
+        "srce/framing.c",
         "srce/oi_codec_version.c",
-        "srce/synthesis-sbc.c",
-        "srce/synthesis-dct8.c",
         "srce/synthesis-8-generated.c",
+        "srce/synthesis-dct8.c",
+        "srce/synthesis-sbc.c",
     ],
     local_include_dirs: [
         "include",
diff --git a/system/embdrv/tests/Android.bp b/system/embdrv/tests/Android.bp
index 1364229693a..7941fa92d95 100644
--- a/system/embdrv/tests/Android.bp
+++ b/system/embdrv/tests/Android.bp
@@ -10,8 +10,8 @@ package {
 cc_test {
     name: "libaptx_enc_tests",
     defaults: [
-        "mts_defaults",
         "bluetooth_gtest_x86_asan_workaround",
+        "mts_defaults",
     ],
     test_suites: ["device-tests"],
     host_supported: true,
@@ -30,8 +30,8 @@ cc_test {
 cc_test {
     name: "libaptxhd_enc_tests",
     defaults: [
-        "mts_defaults",
         "bluetooth_gtest_x86_asan_workaround",
+        "mts_defaults",
     ],
     test_suites: ["device-tests"],
     host_supported: true,
diff --git a/system/hci/Android.bp b/system/hci/Android.bp
index 8b130d81a85..d4e3fc1184a 100644
--- a/system/hci/Android.bp
+++ b/system/hci/Android.bp
@@ -38,13 +38,13 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/bta/include",
+        "packages/modules/Bluetooth/system/btif/include",
         "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
-        "packages/modules/Bluetooth/system/bta/include",
-        "packages/modules/Bluetooth/system/btif/include",
         "system/libhwbinder/include",
-        "packages/modules/Bluetooth/system/gd/rust/shim",
     ],
     product_variables: {
         debuggable: {
@@ -62,10 +62,10 @@ cc_test {
     name: "net_test_hci",
     test_suites: ["device-tests"],
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_basic_defaults",
         "fluoride_test_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: false,
     local_include_dirs: [
@@ -73,11 +73,11 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/osi/test",
         "packages/modules/Bluetooth/system/stack/include",
         "system/libhwbinder/include",
-        "packages/modules/Bluetooth/system/gd/rust/shim",
     ],
     srcs: [
         "test/packet_fragmenter_test.cc",
@@ -89,8 +89,8 @@ cc_test {
     ],
     static_libs: [
         "libbluetooth-for-tests",
-        "libbtcore",
         "libbt-hci",
+        "libbtcore",
     ],
 }
 
@@ -98,9 +98,9 @@ cc_test {
     name: "net_test_hci_fragmenter_native",
     test_suites: ["device-tests"],
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_unit_test_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     local_include_dirs: [
         "include",
@@ -108,8 +108,8 @@ cc_test {
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/osi/test",
+        "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
         "src/buffer_allocator.cc",
diff --git a/system/main/Android.bp b/system/main/Android.bp
index d713313877d..ea91ce872d0 100644
--- a/system/main/Android.bp
+++ b/system/main/Android.bp
@@ -23,30 +23,30 @@ cc_library_static {
     name: "libbte",
     defaults: ["fluoride_basic_defaults"],
     srcs: [
-        ":LibBluetoothSources",
         ":LibBluetoothShimSources",
+        ":LibBluetoothSources",
     ],
     include_dirs: [
+        "hardware/interfaces/keymaster/4.0/support/include",
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/gd/rust/shim",
+        "packages/modules/Bluetooth/system/bta/dm",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
-        "packages/modules/Bluetooth/system/bta/dm",
+        "packages/modules/Bluetooth/system/btif/co",
+        "packages/modules/Bluetooth/system/btif/include",
+        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
+        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
+        "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/internal_include",
-        "packages/modules/Bluetooth/system/stack/include",
-        "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/stack/a2dp",
-        "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/avdt",
+        "packages/modules/Bluetooth/system/stack/btm",
+        "packages/modules/Bluetooth/system/stack/include",
+        "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/btif/include",
-        "packages/modules/Bluetooth/system/btif/co",
         "packages/modules/Bluetooth/system/vnd/include",
-        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
-        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "system/security/keystore/include",
-        "hardware/interfaces/keymaster/4.0/support/include",
     ],
     generated_headers: [
         "BluetoothGeneratedBundlerSchema_h_bfbs",
@@ -69,24 +69,24 @@ cc_library {
     header_libs: ["libbluetooth_headers"],
     export_header_lib_headers: ["libbluetooth_headers"],
     include_dirs: [
+        "hardware/interfaces/keymaster/4.0/support/include",
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/bta/dm",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/bta/sys",
-        "packages/modules/Bluetooth/system/bta/dm",
+        "packages/modules/Bluetooth/system/btif/co",
+        "packages/modules/Bluetooth/system/btif/include",
+        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
+        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
         "packages/modules/Bluetooth/system/internal_include",
-        "packages/modules/Bluetooth/system/stack/include",
-        "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/stack/a2dp",
-        "packages/modules/Bluetooth/system/stack/btm",
         "packages/modules/Bluetooth/system/stack/avdt",
+        "packages/modules/Bluetooth/system/stack/btm",
+        "packages/modules/Bluetooth/system/stack/include",
+        "packages/modules/Bluetooth/system/stack/l2cap",
         "packages/modules/Bluetooth/system/udrv/include",
-        "packages/modules/Bluetooth/system/btif/include",
-        "packages/modules/Bluetooth/system/btif/co",
         "packages/modules/Bluetooth/system/vnd/include",
-        "packages/modules/Bluetooth/system/embdrv/sbc/encoder/include",
-        "packages/modules/Bluetooth/system/embdrv/sbc/decoder/include",
         "system/security/keystore/include",
-        "hardware/interfaces/keymaster/4.0/support/include",
     ],
     whole_static_libs: [
         "libbluetooth_core_rs",
@@ -119,23 +119,23 @@ cc_library_static {
     defaults: ["fluoride_defaults"],
 
     srcs: [
-        ":LibBluetoothSources",
         ":LibBluetoothShimSources",
+        ":LibBluetoothSources",
     ],
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/gd",
-        "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/bta/include",
         "packages/modules/Bluetooth/system/btif/include",
+        "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     generated_headers: [
         "BluetoothGeneratedBundlerSchema_h_bfbs",
-        "BluetoothGeneratedPackets_h",
         "BluetoothGeneratedDumpsysDataSchema_h",
+        "BluetoothGeneratedPackets_h",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -156,9 +156,9 @@ cc_test {
         unit_test: true,
     },
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
@@ -167,6 +167,7 @@ cc_test {
         "packages/modules/Bluetooth/system/stack/include",
     ],
     srcs: [
+        ":BluetoothOsSources_host",
         ":TestCommonMainHandler",
         ":TestCommonMockFunctions",
         ":TestMockBta",
@@ -175,12 +176,11 @@ cc_test {
         ":TestMockLegacyHciInterface",
         ":TestMockMainShimEntry",
         ":TestMockStack",
-        ":BluetoothOsSources_host",
-        "shim/acl_api.cc",
         "shim/acl.cc",
+        "shim/acl_api.cc",
         "shim/acl_legacy_interface.cc",
-        "shim/btm_api.cc",
         "shim/btm.cc",
+        "shim/btm_api.cc",
         "shim/config.cc",
         "shim/controller.cc",
         "shim/distance_measurement_manager.cc",
@@ -201,11 +201,11 @@ cc_test {
         "libbluetooth-dumpsys",
         "libbt-common",
         "libbt-protos-lite",
+        "libbtdevice",
         "libflatbuffers-cpp",
         "libgmock",
         "liblog",
         "libosi",
-        "libbtdevice",
     ],
     shared_libs: [
         "libcrypto",
diff --git a/system/packet/Android.bp b/system/packet/Android.bp
index 97ca3b02442..e67f0837bf6 100644
--- a/system/packet/Android.bp
+++ b/system/packet/Android.bp
@@ -12,12 +12,12 @@ cc_library_static {
     defaults: ["libchrome_support_defaults"],
     host_supported: true,
     export_include_dirs: [
-        "./include",
         "./",
+        "./include",
     ],
     static_libs: [
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
     ],
     apex_available: [
         "com.android.btservices",
@@ -28,9 +28,9 @@ cc_library_static {
 cc_test {
     name: "net_test_btpackets",
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     test_suites: ["device-tests"],
     host_supported: true,
@@ -73,10 +73,10 @@ cc_test {
         "libcrypto",
     ],
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
diff --git a/system/packet/base/Android.bp b/system/packet/base/Android.bp
index f2b65dce27d..114af2cd237 100644
--- a/system/packet/base/Android.bp
+++ b/system/packet/base/Android.bp
@@ -14,8 +14,8 @@ cc_library_static {
     host_supported: true,
     include_dirs: ["packages/modules/Bluetooth/system/include"],
     srcs: [
-        "packet.cc",
         "iterator.cc",
+        "packet.cc",
         "packet_builder.cc",
     ],
     apex_available: [
diff --git a/system/packet/tests/fuzzers/Android.bp b/system/packet/tests/fuzzers/Android.bp
index 3a782073249..2689078fd16 100644
--- a/system/packet/tests/fuzzers/Android.bp
+++ b/system/packet/tests/fuzzers/Android.bp
@@ -15,10 +15,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
     srcs: [
         "avrcp_browse_packet_fuzzer.cc",
@@ -28,10 +28,10 @@ cc_fuzz {
     corpus: ["corpus/avrcp_browse_packets_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -46,10 +46,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
     //system/libbase/include/android-base"
     srcs: [
@@ -60,10 +60,10 @@ cc_fuzz {
     corpus: ["corpus/change_path_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -78,10 +78,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -92,10 +92,10 @@ cc_fuzz {
     corpus: ["corpus/get_capabilities_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -110,10 +110,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -124,10 +124,10 @@ cc_fuzz {
     corpus: ["corpus/get_capabilities_res_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -142,10 +142,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -156,10 +156,10 @@ cc_fuzz {
     corpus: ["corpus/get_item_attributes_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -174,10 +174,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -188,10 +188,10 @@ cc_fuzz {
     corpus: ["get_play_status_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -206,10 +206,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -220,10 +220,10 @@ cc_fuzz {
     corpus: ["corpus/get_total_number_of_items_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -238,10 +238,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -252,10 +252,10 @@ cc_fuzz {
     corpus: ["corpus/pass_through_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -270,10 +270,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -284,10 +284,10 @@ cc_fuzz {
     corpus: ["corpus/play_item_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -302,10 +302,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -316,10 +316,10 @@ cc_fuzz {
     corpus: ["corpus/register_notification_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -334,10 +334,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -348,10 +348,10 @@ cc_fuzz {
     corpus: ["corpus/set_absolute_volume_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -366,10 +366,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -380,10 +380,10 @@ cc_fuzz {
     corpus: ["corpus/set_addressed_player_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -398,10 +398,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -412,10 +412,10 @@ cc_fuzz {
     corpus: ["corpus/set_browsed_player_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -430,10 +430,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -444,10 +444,10 @@ cc_fuzz {
     corpus: ["corpus/vendor_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -462,10 +462,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -476,10 +476,10 @@ cc_fuzz {
     corpus: ["corpus/avrcp_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -494,10 +494,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -508,10 +508,10 @@ cc_fuzz {
     corpus: ["corpus/reject_packet_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -526,10 +526,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -540,10 +540,10 @@ cc_fuzz {
     corpus: ["corpus/get_element_attributes_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -558,10 +558,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -572,10 +572,10 @@ cc_fuzz {
     corpus: ["corpus/change_path_res_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -590,10 +590,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -604,10 +604,10 @@ cc_fuzz {
     corpus: ["corpus/get_element_attributes_res_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -622,10 +622,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -636,10 +636,10 @@ cc_fuzz {
     corpus: ["corpus/get_folder_items_res_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -654,10 +654,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -668,10 +668,10 @@ cc_fuzz {
     corpus: ["corpus/get_folder_items_req_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -686,10 +686,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -700,10 +700,10 @@ cc_fuzz {
     corpus: ["corpus/get_item_attributes_res_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -718,10 +718,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -732,10 +732,10 @@ cc_fuzz {
     corpus: ["corpus/get_play_status_res_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -750,10 +750,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -764,10 +764,10 @@ cc_fuzz {
     corpus: ["corpus/get_total_number_of_items_res_corpus/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
@@ -782,10 +782,10 @@ cc_fuzz {
     include_dirs: [
         "packages/modules/Bluetooth/system/",
         "packages/modules/Bluetooth/system/include",
+        "packages/modules/Bluetooth/system/packet/base",
         "packages/modules/Bluetooth/system/packet/include",
         "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/packet/tests/avrcp",
-        "packages/modules/Bluetooth/system/packet/base",
     ],
 
     srcs: [
@@ -796,10 +796,10 @@ cc_fuzz {
     corpus: ["corpus/set_browsed_player_res_fuzzer/*"],
 
     static_libs: [
-        "libgmock",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libgmock",
     ],
     cflags: [
         "-DBUILDCFG",
diff --git a/system/profile/avrcp/Android.bp b/system/profile/avrcp/Android.bp
index eda175f6bfd..f8007447b6a 100644
--- a/system/profile/avrcp/Android.bp
+++ b/system/profile/avrcp/Android.bp
@@ -10,17 +10,17 @@ package {
 cc_library_static {
     name: "avrcp-target-service",
     defaults: [
-        "fluoride_defaults",
         "clang_file_coverage",
+        "fluoride_defaults",
         "libchrome_support_defaults",
     ],
     host_supported: true,
     include_dirs: [
         "packages/modules/Bluetooth/system",
         "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/gd/rust/shim",
         "packages/modules/Bluetooth/system/internal_include",
         "packages/modules/Bluetooth/system/stack/include",
-        "packages/modules/Bluetooth/system/gd/rust/shim",
     ],
     export_include_dirs: ["./"],
     srcs: [
@@ -45,11 +45,11 @@ cc_test {
     name: "net_test_avrcp",
     test_suites: ["general-tests"],
     defaults: [
-        "fluoride_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_defaults",
         "libchrome_support_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     test_options: {
@@ -69,16 +69,16 @@ cc_test {
         "android.hardware.bluetooth@1.1",
     ],
     static_libs: [
-        "libgmock",
+        "avrcp-target-service",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
-        "libosi",
-        "liblog",
-        "libcutils",
+        "lib-bt-packets-base",
         "libbase",
         "libbtdevice",
-        "avrcp-target-service",
+        "libcutils",
+        "libgmock",
+        "liblog",
+        "libosi",
     ],
     sanitize: {
         cfi: false,
@@ -99,22 +99,22 @@ cc_fuzz {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/internal_include",
+        "packages/modules/Bluetooth/system/packet/tests",
         "packages/modules/Bluetooth/system/stack/include",
     ],
     static_libs: [
         "avrcp-target-service",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
         "libbase",
+        "libbluetooth_gd",
         "libcutils",
-        "libutils",
         "libevent",
         "liblog",
         "libstatslog_bt",
-        "libbluetooth_gd",
+        "libutils",
     ],
     header_libs: ["libbluetooth_headers"],
     corpus: [
diff --git a/system/profile/sdp/Android.bp b/system/profile/sdp/Android.bp
index 2069b1ffa88..abd5f91f56d 100644
--- a/system/profile/sdp/Android.bp
+++ b/system/profile/sdp/Android.bp
@@ -10,8 +10,8 @@ package {
 cc_library_static {
     name: "sdp_service",
     defaults: [
-        "fluoride_defaults",
         "clang_file_coverage",
+        "fluoride_defaults",
     ],
     host_supported: true,
     include_dirs: [
@@ -30,10 +30,10 @@ cc_test {
     name: "bluetooth_test_sdp",
     test_suites: ["general-tests"],
     defaults: [
-        "fluoride_defaults",
+        "bluetooth_gtest_x86_asan_workaround",
         "clang_coverage_bin",
+        "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     host_supported: true,
     include_dirs: [
@@ -43,11 +43,11 @@ cc_test {
         "common/test/data_element_reader_test.cc",
     ],
     static_libs: [
-        "libgmock",
-        "sdp_service",
         "lib-bt-packets",
-        "lib-bt-packets-base",
         "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
         "libbluetooth-types",
+        "libgmock",
+        "sdp_service",
     ],
 }
diff --git a/system/rust/Android.bp b/system/rust/Android.bp
index 95bca4ffd5b..9cb585642be 100644
--- a/system/rust/Android.bp
+++ b/system/rust/Android.bp
@@ -27,19 +27,19 @@ rust_defaults {
         "libbt_shim_ffi",
 
         "libchrome",
-        "libmodpb64",
         "libevent",
+        "libmodpb64",
     ],
     proc_macros: [
         "libasync_trait",
         "libpaste",
     ],
     rustlibs: [
-        "liblog_rust",
         "libanyhow",
-        "libcxx",
-        "libbt_common",
         "libbitflags",
+        "libbt_common",
+        "libcxx",
+        "liblog_rust",
 
         // needed to work around duplicate symbols
         // caused by bug in Soong
@@ -58,13 +58,13 @@ rust_defaults {
             shared_libs: [
                 "android.hardware.bluetooth@1.0",
                 "android.hardware.bluetooth@1.1",
-                "android.system.suspend.control-V1-ndk",
                 "android.system.suspend-V1-ndk",
+                "android.system.suspend.control-V1-ndk",
                 "libbinder_ndk",
                 "libcutils",
                 "libhidlbase",
-                "libutils",
                 "libstatslog_bt",
+                "libutils",
             ],
         },
     },
@@ -107,17 +107,17 @@ cc_library_static {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
+        "packages/modules/Bluetooth/system/gd",
         "packages/modules/Bluetooth/system/include",
-        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/internal_include",
-        "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/stack/include",
         "packages/modules/Bluetooth/system/types",
     ],
     export_include_dirs: ["."],
     static_libs: [
         "libbluetooth-core",
-        "libbt_shim_ffi",
         "libbt_shim_bridge",
+        "libbt_shim_ffi",
     ],
     generated_headers: [
         "cxx-bridge-header",
diff --git a/system/test/Android.bp b/system/test/Android.bp
index 89405adba98..f1c379b000b 100644
--- a/system/test/Android.bp
+++ b/system/test/Android.bp
@@ -292,8 +292,8 @@ filegroup {
 filegroup {
     name: "TestMockMainShimLeScanning",
     srcs: [
-        "mock/mock_main_shim_le_scanning_manager.cc",
         "mock/mock_main_shim.cc",
+        "mock/mock_main_shim_le_scanning_manager.cc",
     ],
 }
 
@@ -307,8 +307,8 @@ filegroup {
 filegroup {
     name: "TestMockBtif",
     srcs: [
-        ":TestCommonJniThread",
         ":TestCommonCoreInterface",
+        ":TestCommonJniThread",
         ":TestMockBluetoothInterface",
         "mock/mock_btif*.cc",
     ],
@@ -504,18 +504,18 @@ filegroup {
 }
 
 filegroup {
-  name: "TestMockGdOsLoggingLogRedaction",
-  srcs: [
-      "mock/mock_gd_os_logging_log_redaction.cc"
-  ],
+    name: "TestMockGdOsLoggingLogRedaction",
+    srcs: [
+        "mock/mock_gd_os_logging_log_redaction.cc",
+    ],
 }
 
 filegroup {
-  name: "TestFakeOsi",
-  srcs: [
-      ":TestMockOsi",
-      "fake/fake_osi.cc"
-  ],
+    name: "TestFakeOsi",
+    srcs: [
+        ":TestMockOsi",
+        "fake/fake_osi.cc",
+    ],
 }
 
 cc_defaults {
@@ -545,20 +545,20 @@ cc_test {
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
-        "packages/modules/Bluetooth/system/include",
         "packages/modules/Bluetooth/system/gd",
+        "packages/modules/Bluetooth/system/include",
     ],
     srcs: [
-        "common/log_msg_test.cc",
         "common/log_msg.cc",
+        "common/log_msg_test.cc",
     ],
     shared_libs: [
         "libchrome",
     ],
     cflags: [
         "-Wall",
-        "-Wextra",
         "-Werror",
+        "-Wextra",
         // there are too many unused parameters in all the code.
         "-Wno-unused-parameter",
         // http://b/264549607
diff --git a/system/test/headless/Android.bp b/system/test/headless/Android.bp
index f787e61880e..beff3d36ac9 100644
--- a/system/test/headless/Android.bp
+++ b/system/test/headless/Android.bp
@@ -46,10 +46,10 @@ cc_binary {
         "fluoride_defaults",
     ],
     cflags: [
-        "-Wno-date-time",
         "-Wall",
-        "-Wextra",
         "-Werror",
+        "-Wextra",
+        "-Wno-date-time",
     ],
     generated_headers: [
         "HeadlessBuildTimestamp",
@@ -78,6 +78,10 @@ cc_binary {
         "android.hardware.bluetooth.a2dp@1.0",
         "android.system.suspend.control-V1-ndk",
         "avrcp-target-service",
+        "lib-bt-packets",
+        "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libFraunhoferAAC",
         "libaudio-a2dp-hw-utils",
         "libbluetooth-dumpsys",
         "libbluetooth_gd",
@@ -85,26 +89,22 @@ cc_binary {
         "libbt-audio-hal-interface",
         "libbt-bta",
         "libbt-bta-core",
-        "libbt_callbacks_cxx",
         "libbt-common",
-        "libbtdevice",
-        "libbte",
         "libbt-hci",
-        "libbtif",
-        "libbtif-core",
-        "lib-bt-packets",
-        "lib-bt-packets-avrcp",
-        "lib-bt-packets-base",
         "libbt-protos-lite",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
-        "libbt_shim_bridge",
-        "libbt_shim_ffi",
         "libbt-stack",
         "libbt-stack-core",
+        "libbt_callbacks_cxx",
+        "libbt_shim_bridge",
+        "libbt_shim_ffi",
+        "libbtdevice",
+        "libbte",
+        "libbtif",
+        "libbtif-core",
         "libc++fs",
         "libflatbuffers-cpp",
-        "libFraunhoferAAC",
         "libg722codec",
         "liblc3",
         "libopus",
@@ -114,11 +114,11 @@ cc_binary {
         "libz",
     ],
     shared_libs: [
-        "android.hardware.bluetooth@1.0",
-        "android.hardware.bluetooth@1.1",
+        "android.hardware.bluetooth.audio-V3-ndk",
         "android.hardware.bluetooth.audio@2.0",
         "android.hardware.bluetooth.audio@2.1",
-        "android.hardware.bluetooth.audio-V3-ndk",
+        "android.hardware.bluetooth@1.0",
+        "android.hardware.bluetooth@1.1",
         "android.system.suspend-V1-ndk",
         "libaaudio",
         "libbase",
diff --git a/system/test/rootcanal/Android.bp b/system/test/rootcanal/Android.bp
index daa03b23013..48bf7737913 100644
--- a/system/test/rootcanal/Android.bp
+++ b/system/test/rootcanal/Android.bp
@@ -42,20 +42,20 @@ cc_binary {
         "android.hardware.bluetooth@1.0",
         "android.hardware.bluetooth@1.1",
         "libbase",
+        "libcrypto",
         "libcutils",
         "libhidlbase",
         "libjsoncpp",
         "liblog",
-        "libutils",
         "libprotobuf-cpp-lite",
-        "libcrypto",
+        "libutils",
     ],
     cflags: [
         "-fvisibility=hidden",
     ],
     generated_headers: [
-        "RootCanalGeneratedPackets_h",
         "BluetoothGeneratedPackets_h",
+        "RootCanalGeneratedPackets_h",
         "libbt_init_flags_bridge_header",
     ],
     whole_static_libs: [
@@ -98,12 +98,12 @@ cc_library_shared {
         "libhidlbase",
         "libjsoncpp",
         "liblog",
-        "libutils",
         "libprotobuf-cpp-lite",
+        "libutils",
     ],
     generated_headers: [
-        "RootCanalGeneratedPackets_h",
         "BluetoothGeneratedPackets_h",
+        "RootCanalGeneratedPackets_h",
         "libbt_init_flags_bridge_header",
     ],
     whole_static_libs: [
diff --git a/system/test/suite/Android.bp b/system/test/suite/Android.bp
index 542a3704775..383f512f8e1 100644
--- a/system/test/suite/Android.bp
+++ b/system/test/suite/Android.bp
@@ -37,7 +37,6 @@ cc_defaults {
         "system/libhwbinder/include",
     ],
     srcs: [
-        "adapter/bluetooth_test.cc",
         ":BtaDmSources",
         ":TestCommonMockFunctions",
         ":TestMockAndroidHardware",
@@ -46,6 +45,7 @@ cc_defaults {
         ":TestMockHci",
         ":TestMockSystemLibfmq",
         ":TestMockUdrv",
+        "adapter/bluetooth_test.cc",
     ],
     shared_libs: [
         "android.hardware.bluetooth.audio@2.0",
@@ -65,6 +65,10 @@ cc_defaults {
         "android.hardware.bluetooth.a2dp@1.0",
         "android.system.suspend.control-V1-ndk",
         "avrcp-target-service",
+        "lib-bt-packets",
+        "lib-bt-packets-avrcp",
+        "lib-bt-packets-base",
+        "libFraunhoferAAC",
         "libaudio-a2dp-hw-utils",
         "libbluetooth-dumpsys",
         "libbluetooth-types",
@@ -72,33 +76,29 @@ cc_defaults {
         "libbt-bta",
         "libbt-bta-core",
         "libbt-common",
-        "libbtcore",
-        "libbtdevice",
-        "libbte",
         "libbt-hci",
-        "libbtif",
-        "libbtif-core",
-        "lib-bt-packets",
-        "lib-bt-packets-avrcp",
-        "lib-bt-packets-base",
         "libbt-sbc-decoder",
         "libbt-sbc-encoder",
         "libbt-stack",
         "libbt-stack-core",
+        "libbtcore",
+        "libbtdevice",
+        "libbte",
+        "libbtif",
+        "libbtif-core",
+        "libc++fs",
         "libcom.android.sysprop.bluetooth",
         "libflatbuffers-cpp",
-        "libFraunhoferAAC",
         "libg722codec",
         "libgmock",
         "liblc3",
         "libopus",
         "libosi",
         "libstatslog_bt",
-        "libc++fs",
     ],
     header_libs: [
-        "libhardware_headers",
         "libbluetooth_headers",
+        "libhardware_headers",
     ],
     target: {
         android: {
@@ -113,9 +113,9 @@ cc_test {
     name: "net_test_bluetooth",
     test_suites: ["device-tests"],
     defaults: [
-        "net_test_defaults",
-        "mts_defaults",
         "bluetooth_gtest_x86_asan_workaround",
+        "mts_defaults",
+        "net_test_defaults",
     ],
     srcs: [
         "adapter/adapter_unittest.cc",
diff --git a/system/types/Android.bp b/system/types/Android.bp
index 1f826ff02d6..4e1b84b1ba7 100644
--- a/system/types/Android.bp
+++ b/system/types/Android.bp
@@ -18,9 +18,9 @@ cc_library_headers {
     native_bridge_supported: true,
     apex_available: [
         "//apex_available:platform",
+        "com.android.btservices",
         "com.android.media",
         "com.android.media.swcodec",
-        "com.android.btservices",
     ],
     // As part of updatable mainline modules(media, swcodec), it should support at least 29(Q)
     min_sdk_version: "29",
@@ -42,9 +42,9 @@ cc_library_static {
     visibility: ["//visibility:public"],
     host_supported: true,
     srcs: [
+        "bluetooth/uuid.cc",
         "class_of_device.cc",
         "raw_address.cc",
-        "bluetooth/uuid.cc",
     ],
     header_libs: ["libbluetooth-types-header"],
     export_header_lib_headers: ["libbluetooth-types-header"],
@@ -59,9 +59,9 @@ cc_test {
     name: "net_test_types",
     test_suites: ["device-tests"],
     defaults: [
+        "bluetooth_gtest_x86_asan_workaround",
         "fluoride_defaults",
         "mts_defaults",
-        "bluetooth_gtest_x86_asan_workaround",
     ],
     include_dirs: [
         "packages/modules/Bluetooth/system",
diff --git a/system/vendor_libs/linux/interface/Android.bp b/system/vendor_libs/linux/interface/Android.bp
index 0ad3acebd5f..49f65dec109 100644
--- a/system/vendor_libs/linux/interface/Android.bp
+++ b/system/vendor_libs/linux/interface/Android.bp
@@ -28,9 +28,9 @@ cc_binary {
     proprietary: true,
     relative_install_path: "hw",
     srcs: [
-        "hci_packetizer.cc",
-        "h4_protocol.cc",
         "bluetooth_hci.cc",
+        "h4_protocol.cc",
+        "hci_packetizer.cc",
         "service.cc",
     ],
     header_libs: ["libbluetooth_headers"],
@@ -71,14 +71,14 @@ cc_test_host {
     name: "bluetooth-btlinux-hci-test",
     srcs: [
         "async_fd_watcher.cc",
-        "hci_packetizer.cc",
         "h4_protocol.cc",
         "h4_protocol_unittest.cc",
+        "hci_packetizer.cc",
     ],
     cflags: [
+        "-DNO_THREAD_PRIORITY",
         "-Wall",
         "-Werror",
-        "-DNO_THREAD_PRIORITY",
     ],
     shared_libs: [
         "libbase",
-- 
GitLab