Forward port "Add an option to change the device hostname."

Change-Id: Ibc145b74036617248d4f33c6866cc9c8a8cc8974

Conflicts:
	res/values/cm_strings.xml