am 6f355d2c: am 045be135: Merge "liblog: logcat color output corrupted on 32-bit"

* commit '6f355d2c8f661caa3ec6e814c5be7c3ec077de3e':
  liblog: logcat color output corrupted on 32-bit