am e7c2a401: am 88492ec4: Merge "liblog: build cleanup"

* commit 'e7c2a40197e8c800a239e28aaafbbb0da7586054':
  liblog: build cleanup