Add aries to device names. CWM Recovery requires device name aries
Building AntHalService fails if all dpi levels are set
Merge branch 'cm-12.0' of github.com:HaraldWeber/android_device_sony_z3c into cm-12.0