Merge "Schematize vold system properties" am: 095d0f640e
am: 73694f8faa

Change-Id: If420ffa861d9d85f2baca9224b96f2716965f4b5