g2-common: Move prop overrides to system_prop.mk

Conflicts:
	g2.mk