[automerger skipped] Merge "Revert "Revert "Schematize vold system properties"""
am: 9dfd13e7ea  -s ours

Change-Id: I109fb699c655d29fcce3d1dc016f33c24f2586db