Merge https://github.com/Octo-Kat/vendor_oct into kk-4.4

Conflicts:
	config/common.mk
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc003/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc004/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc005/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc310-mnc006/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc311-mnc220/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc311-mnc225/eri.xml
	overlay/common/frameworks/base/core/res/res/xml-mcc311-mnc580/eri.xml
	products/AndroidProducts.mk
	products/oct_mako.mk
	vendorsetup.sh