Merge "liblogcat: replace NULL with nullptr"