[automerger skipped] Merge "Revert "Revert "Schematize vold system properties"""
am: cc24a22da9 -s ours
Change-Id: I19f28ff740c8cf3bb0ec1d68cef80563998154f2
This commit is contained in:
am: cc24a22da9 -s ours
Change-Id: I19f28ff740c8cf3bb0ec1d68cef80563998154f2