Merge "[adb] Modernize codebase by replacing NULL with nullptr"
am: a63b3309ff

Change-Id: I7183b79b8210e15986418187b0dcc13233bed294