am 6b95c469: Merge "Switch liblog.so to hash-style=both"

* commit '6b95c469b2b4c3c858e148d53e8e83208a87ce8e':
  Switch liblog.so to hash-style=both