Merge \\\"Address old review comments in adb_auth_host.cpp.\\\" am: 57bbedc036 am: a81117b8f9
am: e8d4b42ffa

Change-Id: I333dd8d877c5f3dc5c50c6225c055e5982a673eb