fix some commit fail

Change-Id: I6a3a3adabc8f2aba7e49c8a8f45fd0d2e850887d
Merge branch 'cm-12.0' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-12.0

Conflicts:
	hlte-common/proprietary/vendor/lib/libOpenCL.so