Clean up init

Conflicts:
	system_prop.mk
More clean up and fstab update