Merge "Schematize vold system properties"
am: 095d0f640e

Change-Id: I6d2dde29d3e2a01e3c0d0e5fe882c026f4c37531