[automerger skipped] Merge "Revert "Schematize vold system properties"" am: 94ef16b6e3 am: a35a0418c1
am: c7a5a2f39a  -s ours

Change-Id: Ia94db75475da21cbcb87b2db615714473192275d