Merge "Remove unnecessary std::unary_function base classes" am: 1ff7e26b am:...

Merge "Remove unnecessary std::unary_function base classes" am: 1ff7e26b am: d346a0d0 am: 201cad7f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2199557



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