Merge remote-tracking branch 'lg-devs/cm-12.0' into ose

Conflicts:
	cm.dependencies
	cm.mk
	device.mk
	overlay/frameworks/base/core/res/res/xml-mcc310-mnc004/eri.xml
	system.prop
Merge branch 'ose' of github.com:OSE-Lollipop/device_lge_vs980 into ose