Cleanup system.prop

Change-Id: I47626af3d0443a7266e56daf5df828e314deeeba