Merge "[verity] Modernize codebase by replacing NULL with nullptr"
am: 5e2ff37628

Change-Id: I67bf5811ccbf43c67ad3eb8b6710c30c712ed532