Merge "Use nullptr instead of NULL for make_pair" am: 9ba7525071 am: ed2343ac19

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1949444

Change-Id: I3e0eb28fba9561998796a516b907f223c5a71fb0