Dlx:
*Prop files from M7 GE 4.3 excluding camera
*BCM prop files from HTC Butterfly 4.2.2 OTA

Conflicts:

	dlx-vendor-blobs.mk
	proprietary/bin/efsks
	proprietary/bin/mpdecision
	proprietary/bin/thermald
	proprietary/etc/firmware/ILP0100_IPM_Code_out.bin
	proprietary/etc/firmware/ILP0100_IPM_Data_out.bin
	proprietary/lib/hw/sensors.dlx.so
	proprietary/lib/libcsd-client.so
	proprietary/lib/libgemini.so
	proprietary/lib/libimage-jpeg-dec-omx-comp.so
	proprietary/lib/libimage-jpeg-enc-omx-comp.so
	proprietary/lib/libimage-omx-common.so
	proprietary/lib/libimu.so
	proprietary/lib/libmllite.so
	proprietary/lib/libmlplatform.so
	proprietary/lib/libmm-abl-oem.so
	proprietary/lib/libmpl_jni.so
	proprietary/lib/libqcci_legacy.so