Merge branch 'ose' of github.com:Team-OSE/device_samsung_hlte into ose

Conflicts:
	ose.dependencies
	ose.mk
	rootdir/etc/fstab.qcom