Cleanup system.prop

Change-Id: I509bc3a35c97d7dd31a2afe60e17b9fc7b626f45