Merge "Add vold commands for setting up per-user encrypted user directories"