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

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



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