Merge "Revert "Schematize vold system properties""
am: 94ef16b6e3

Change-Id: If9a59cfa4939e3ef2cdc7c50e0151c33c58b24aa