Initial upload
Merge remote-tracking branch 'upstream/cfx4.2' into ion

Conflicts:
	AndroidProducts.mk
	BoardConfig.mk
	overlay/frameworks/base/core/res/res/values/config.xml
	system.prop
	vendorsetup.sh