Merge "adb: fix clang-format for access modifier dedent."