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

Change-Id: I553c77d877e18424566bb14111bad2adbfa2cf1e