Merge "snapuserd: Remove legacy xor code."