Merge "Set $HOSTNAME in adbd." am: 2364d7ccc5
am: 510552149c

Change-Id: I9aaae73846ed0388b24769589a14d9d824372ca9