Add support for overriding build.prop settings.

Conflicts:
	core/Makefile