Revert "Revert "Schematize vold system properties""
am: 97b0fe0ac6

Change-Id: I8b6e78df6e31500df448addb82bed9d2c11c8fec