bring inline with garwynn's vendor blobs
Merge branch 'origin/cm-11.0'

Conflicts:
	klte/klte-vendor-blobs.mk