Revert "fix clean, change some other stuff"

This reverts commit db27b15e4b827a3d9648f28a803fcb19e98e4f9d.

Conflicts:
	build.sh

Change-Id: I794cf6cff38f83977841e01c8038d82d99df4581