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

Conflicts:
	ose.dependencies