am 6d8b21a8: Merge "Fix TinyHashMap to use generic hash_type instead of hash_t"

* commit '6d8b21a84c92904a966d77f3c6c0282e92c2b077':
  Fix TinyHashMap to use generic hash_type instead of hash_t