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

Change-Id: Iaf04be2499bf69f3367c653d4fed23ebd9f2cfd2