Fix Build Error
\Merge branch 'master' of https://github.com/slg1119/proprietary_vendor_lge

Conflicts:
	su640/proprietary/bin/ami304d
	su640/proprietary/bin/ks
	su640/proprietary/bin/mpdecision
	su640/proprietary/bin/netmgrd
	su640/proprietary/bin/qcks
	su640/proprietary/bin/qmiproxy
	su640/proprietary/bin/qmuxd
	su640/proprietary/bin/qrngd
	su640/proprietary/bin/rild
	su640/proprietary/bin/rmt_storage
	su640/proprietary/bin/thermald
	su640/proprietary/bin/time_daemon
	su640/proprietary/etc/firmware/BCM4330B1_002.001.003.0243.0308.hcd
	su640/proprietary/lib/egl/libEGL_adreno200.so
	su640/proprietary/lib/egl/libGLESv2_adreno200.so
	su640/proprietary/lib/libacdbloader.so
	su640/proprietary/lib/libacdbmapper.so
	su640/proprietary/lib/libaudcal.so
	su640/proprietary/lib/libdiag.so
	su640/proprietary/lib/libdsi_netctrl.so
	su640/proprietary/lib/libdsutils.so
	su640/proprietary/lib/libgemini.so
	su640/proprietary/lib/libidl.so
	su640/proprietary/lib/libmmipl.so
	su640/proprietary/lib/libmmjpeg.so
	su640/proprietary/lib/libnetmgr.so
	su640/proprietary/lib/liboemcamera.so
	su640/proprietary/lib/libqdp.so
	su640/proprietary/lib/libqmi.so
	su640/proprietary/lib/libqmiservices.so
	su640/su640-vendor-blobs.mk