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

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

Change-Id: I3e2e55e9d305742c5bb4e27c6ee2482d39d55ed4