Merge "liblogcat: replace NULL with nullptr" am: 7826f853bc am: dcf6021ee1
am: fe4e8518cb

Change-Id: I88685d92b9ba905d8f04bae001ac6840e1e620c3