Cleanup: remove duplicate entries from system.prop

Change-Id: Ie489afb0d4f924c6133f14e942ab88b73fcb6778