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

(cherry picked from commit b94f187033e4be221a28b7468ffc4053da72c1fa)

Conflicts:
	mako/mako-vendor-blobs.mk