System.prop restructuring

Change-Id: I0b312c0f74418926d0d7db84f083523ad5b54312