Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_device_htc_enrc2b into aosp-plus_4.3

Conflicts:
	cm.mk
	configs/audio_effects.conf
	configs/audio_policy.conf
	configs/media_codecs.xml
	configs/media_profiles.xml
	enrc2b.mk
	overlay/frameworks/base/core/res/res/values/config.xml
	prebuilt/soundimage/Sound_BT_CarMode.txt
	prebuilt/soundimage/Sound_FM_HP.txt
	prebuilt/soundimage/Sound_FM_HP_XA.txt
	prebuilt/soundimage/Sound_FM_SPK.txt
	prebuilt/soundimage/Sound_FM_SPK_XA.txt
	prebuilt/soundimage/Sound_Note_Recording.txt
	prebuilt/soundimage/Sound_Original.txt
	prebuilt/soundimage/Sound_Original_DOCK.txt
	prebuilt/soundimage/Sound_Original_HP.txt
	prebuilt/soundimage/Sound_Original_HP_XA.txt
	prebuilt/soundimage/Sound_Original_SPK.txt
	prebuilt/soundimage/Sound_Original_SPK_RING.txt
	prebuilt/soundimage/Sound_Original_SPK_RING_XA.txt
	prebuilt/soundimage/Sound_Original_SPK_XA.txt
	prebuilt/soundimage/Sound_Phone_Original_BT.txt
	prebuilt/soundimage/Sound_Phone_Original_DOCK.txt
	prebuilt/soundimage/Sound_Phone_Original_HAC.txt
	prebuilt/soundimage/Sound_Phone_Original_HP.txt
	prebuilt/soundimage/Sound_Phone_Original_REC.txt
	prebuilt/soundimage/Sound_Phone_Original_SPK.txt
	prebuilt/soundimage/Sound_Phone_Original_SPK_XA.txt
	prebuilt/soundimage/Sound_Phone_Original_TTY.txt
	prebuilt/soundimage/Sound_Rec_Landscape.txt
	prebuilt/soundimage/Sound_Rec_Portrait.txt
	prebuilt/soundimage/Sound_SpeakerVR_Recording.txt
	prebuilt/soundimage/Sound_Voice_Recording_AMR.txt
	prebuilt/soundimage/Sound_Voip_Original_BT.txt
	prebuilt/soundimage/Sound_Voip_Original_BT_AEC.txt
	prebuilt/soundimage/Sound_Voip_Original_HP.txt
	prebuilt/soundimage/Sound_Voip_Original_HP_AEC.txt
	prebuilt/soundimage/Sound_Voip_Original_REC.txt
	prebuilt/soundimage/Sound_Voip_Original_REC_AEC.txt
	prebuilt/soundimage/Sound_Voip_Original_SPK.txt
	prebuilt/soundimage/Sound_Voip_Original_SPK_AEC.txt
	prebuilt/soundimage/Sound_Voip_Original_SPK_AEC_XA.txt
	prebuilt/soundimage/Sound_Voip_Original_SPK_XA.txt
	prebuilt/usr/keylayout/qwerty.kl
	proprietary-files.txt