(cherry picked from commit decff173)

Conflicts:
	odk/setsdkenv_unix

Change-Id: I4d78ebbb9f7b6d188dcba2140f26a17a8c17732f