I dont know what the hell i was thinking when i did this...
Revert "re-write envsetup.sh to include device setup"

This reverts commit 9eadcfe0efc6d252af81123ae1b4ab1580031d66.