Merge "Revert "Schematize vold system properties"" am: 94ef16b6e3
am: a35a0418c1

Change-Id: I7ca5d4d85897ac4d2d851c05b9f69c986f6a662a