msm: HTC 8660: update defconfigs after moving msm_8x60 code

Conflicts:
	arch/arm/configs/ruby_defconfig