Some small build.prop tweaks

Conflicts:
	system.prop

Change-Id: I82c0d0ad973b58963f2a268a224a308cb487ffe0