Merge "Schematize vold system properties"
am: 8cf17f7234

Change-Id: I6d9782dfc2cd54f6620c226d37ca3e81dc19647f