am 7a16ffe2: Merge "Replace NULL macros with nullptr literals."

* commit '7a16ffe2e5eed6d299673f8a3061f1a12b3d3ab8':
  Replace NULL macros with nullptr literals.