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

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