Merge "Stop setting $HOSTNAME in mkshrc."
am: 5677920e65

Change-Id: I694b38a3872a1e17fb2135a6a4635bb93fd801df