Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION"