Merge "Remove use of std::unary_function and std::binary_function" am: 07ef32e13a am: c04f8f956d

Original change: https://android-review.googlesource.com/c/platform/external/llvm/+/2202076

Change-Id: I627b798559e2a85cc4b2d0c3ffb5f61925edeb8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>