Merge "e2fsprogs: export uuid/uuid.h"