Merge "Revert "Revert "Schematize vold system properties"""