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 am: 88b734e2 am: 764e5cf2

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



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