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

Conflicts:
	ose.dependencies