Merge branch 'cm-11.0' of github.com:TheMuppets/proprietary_vendor_samsung into HEAD

Conflicts:
	d2lte/d2lte-vendor-blobs.mk

Change-Id: I184dada298f682a86f89f9a75278de73c7002f40