Revert "Moved some system.prop options to the common side"

This reverts commit 318b0ee2dfe1147f84f834bf42b7694754e5228c.