Merge "Stop setting $HOSTNAME in mkshrc." am: 5677920e65 am: 12d6e8bb3f
am: 4ee8234275

Change-Id: I4f8ac7303b8cec103ad7ada5258eac3f076eb40f