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

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