Merge branch 'kitkat' of https://github.com/k5t4j5/vendor_aokp into kitkat

Conflicts:
	products/gee.mk
Merge branch 'kitkat' of https://github.com/k5t4j5/vendor_aokp into kitkat

Conflicts:
	products/gee.mk