Merge "logd: switch to unordered_map from BasicHashtable"