am 88492ec4: Merge "liblog: build cleanup"

* commit '88492ec4e171a33b2d1ef42a0b7714cb2abedd0f':
  liblog: build cleanup