Merge "Use standard colors in logcat color output"