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

Conflicts:
	ose.dependencies
	ose.mk