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

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

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