[automerger skipped] Merge "Schematize vold system properties" am: 8cf17f7234 am: 09a7954114
am: cd614a097e  -s ours

Change-Id: I2ba852d7747964f530d9616c0eabcd25f211ae0b