Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_device_htc_msm8960-common into 'kitkat'

Conflicts:
	BoardConfigCommon.mk

Change-Id: I0189389d4270d341272e2fd6d854abba9568b0c7