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

Conflicts:
	ose.dependencies