Merge "[adb] Followup CL to clean up adb_auth_host.cpp" am: 9c7f9215e4
am: 979998b965

* commit '979998b9655ab1a306c1cfbda427ffd8847796ee':
  [adb] Followup CL to clean up adb_auth_host.cpp

Change-Id: I6e2adcb89004594cb0fca9d9f133dd470602feaa