fix some commit fail

Change-Id: I6a3a3adabc8f2aba7e49c8a8f45fd0d2e850887d
add missing drm blobs

Change-Id: I11112160eb4647773a195a2808bc80f9d784ec12
lolipop qc opt blob

Change-Id: I1f087f44c1204719909139790b54f69a0bd5e696
Merge branch 'cm-12.0' of https://github.com/TheMuppets/proprietary_vendor_samsung into cm-12.0
trlte-common: Update time service libs.
Merge remote-tracking branch 'Slayer/cm-12.0' into cm-12.0

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