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

Change-Id: I75c37c7f8235071d0f66acd46833d118962c629f