Merge "Revert "Schematize vold system properties"" am: 6ee45c6f14
am: 510c8c463f

Change-Id: If137d417a8f042e8cbde842578caaa3e54bb8c6d