Merge "[adb] Followup CL to clean up adb_auth_host.cpp"