Merge "liblog: logcat color output corrupted on 32-bit"