Merge "Revert "libsnapshot: Don't package snapuserd.rc in /vendor/etc.""