props: move to system.prop and general cleanup

Change-Id: I8656d8ba1b837602e9d294762304faf1d4363f53

Conflicts:
	system.prop