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

Change-Id: Ib5fa7548a2ef15d3d78fdcabb2b66ce3e3a947f1