Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"