rename device_ace.mk to device.mk

Change-Id: I239baccbfa8f10de33e353c4391255ff1e208a04
kill htc common

Change-Id: I107bf12143431c7421f90552383042dfa01b13b0

Conflicts:
	device.mk
Merge branch 'jb-mv' of git://github.com/Mustaavalkosta/android_device_htc_ace into cm-10.1
Merge branch 'cm-10.1' of github.com:yanniks/android_device_htc_ace into jellybean