Merge remote-tracking branch 'cm/cm-11.0' into ose

Conflicts:
	cm.dependencies
Merge branch 'ose' of https://github.com/Team-OSE/device_samsung_d2lte into ose