Cleanup system.prop

Change-Id: I5306892e0596501e789eed10ced1088a58124e03

Conflicts:
	system.prop