Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_htc_dlx into HEAD

Conflicts:
	cm.mk

Change-Id: Id5f3743755ebc407193f0ab7c5555a67a161b39a