Merge "adb: clean up handle_host_request." am: f41897a66e
am: b97de6d007

Change-Id: I57abff770a15e52349878772d78fe2325e0fd896