[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am: 9dfd13e7ea -s ours am: 81b6da69b6 -s ours
am: fead48f400 -s ours
Change-Id: Iedfd3c1dda665006ea5410ee787c3ca447ac7db1
This commit is contained in: