Merge "Schematize vold system properties" am: 8cf17f7234
am: 09a7954114

Change-Id: I1a42e00ad024b471bcc51d8e0ef0f50fea34fcbe