Merge "[automerger skipped] Merge "Schematize vold system properties" am: 095d0f640e am: 73694f8faa am: 1a7cad6b1a  -s ours"