GRIND-56: Changed clean.sh so Grizzly and Havana don't clobber eachother.

Change-Id: I7fd314acb34a05b102c7b5b3e58fa2b140a145a8