Merge remote-tracking branch 'th/kitkat' into kitkat

Change-Id: I17b0bd93d4b9077962b731c644c8c17fb4c0d998
Merge branch 'kitkat' of https://github.com/TeamHorizon/vendor_xenonhd into kitkat

Conflicts:
	products/common.mk

Change-Id: Ie9d414540940ab47b6258cfe611cb6d27c5424c8