Adjust TheMuppets
Adjust TheMuppets 2
m7-common: update camera proprietary files

HTC version: 2.14.1700.15

Conflicts:

	m7-common/proprietary/lib/hw/vendor-camera.msm8960.so
	m7-common/proprietary/lib/libBeautyChat.so
	m7-common/proprietary/lib/libcameraasd.so
	m7-common/proprietary/lib/libcameraface.so
	m7-common/proprietary/lib/libcamerapp.so
	m7-common/proprietary/lib/libchromatix_imx135_default_video.so
	m7-common/proprietary/lib/libchromatix_imx135_hdr.so
	m7-common/proprietary/lib/libchromatix_imx135_hfr.so
	m7-common/proprietary/lib/libchromatix_imx135_preview.so
	m7-common/proprietary/lib/libchromatix_imx135_zsl.so
	m7-common/proprietary/lib/libchromatix_ov2722_default_video.so
	m7-common/proprietary/lib/libchromatix_ov2722_hdr.so
	m7-common/proprietary/lib/libchromatix_ov2722_preview.so
	m7-common/proprietary/lib/libchromatix_ov2722_zsl.so
	m7-common/proprietary/lib/libchromatix_vd6869_default_video.so
	m7-common/proprietary/lib/libchromatix_vd6869_hdr.so
	m7-common/proprietary/lib/libchromatix_vd6869_hfr.so
	m7-common/proprietary/lib/libchromatix_vd6869_hfr_60fps.so
	m7-common/proprietary/lib/libchromatix_vd6869_night.so
	m7-common/proprietary/lib/libchromatix_vd6869_preview.so
	m7-common/proprietary/lib/libchromatix_vd6869_video_hdr.so
	m7-common/proprietary/lib/libchromatix_vd6869_zoe.so
	m7-common/proprietary/lib/libchromatix_vd6869_zsl.so
	m7-common/proprietary/lib/libhtccamera_yushaniiproc.so
	m7-common/proprietary/lib/libmmcamera_aec.so
	m7-common/proprietary/lib/libmmcamera_frameproc.so
	m7-common/proprietary/lib/libmmcamera_interface2.so
	m7-common/proprietary/lib/libmmcamera_rawchipproc.so
	m7-common/proprietary/lib/libmmcamera_statsproc31.so
	m7-common/proprietary/lib/liboemcamera.so