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

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

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