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

Change-Id: Ifa0dd3f795394e977275732f3f831d9ff12399ef