Spirit stuff

Change-Id: I76b59ebf0a1057a9dc007aa81f4e6e1a855c4df6

Conflicts:
	core/Makefile
	core/product_config.mk
	tools/roomservice.py