[Matahari] [PATCH] src/lib/utilities.c: Fix/simplify part of matahari_uuid()