Added support for Android TV

Conflicts:
	CHANGELOG.md