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

* commit '7286c9e9fba39c79e5c94bb41e9d3541fbf28654':
  liblog: build cleanup