Merge "snapuserd: Remove dead code from legacy snapuserd."