[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am: cc24a22da9  -s ours am: 95a1128814  -s ours
am: fe9f5c42f6  -s ours

Change-Id: I5f75b15ab792329cdb9bf2dd2e4b42bccb6eb0f3