pyramid --> doubleshot

Conflicts:
	Android.mk
	BoardConfig.mk
	device_pyramid.mk
	msm8660.mk
	setup-makefiles.sh
	system.prop