Revert "rename device_ace.mk to device.mk"

This reverts commit 43ff9b30a6ecc6fe7afb5859a523cb40d55d956c.
Merge branch 'cm-10.1' of github.com:yanniks/android_device_htc_ace into jellybean