Merge "Revert "Schematize vold system properties""
am: 6ee45c6f14

Change-Id: I085d9f227b7632f01cd614d46db7a6da349349fc