[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am: 9dfd13e7 -s ours am: 81b6da69 -s ours Change-Id: I7d4f09d27a2626c9f49ec0c5f88976a543a955f0