Merge "Switch liblog.so to hash-style=both"