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

Change-Id: I4635bbfdf62680bec5ece872d89aa2cc0936fea3