std::mem_fun() and std::bind2nd() are removed in c++17. Switch to simpler logic that does not require those functions. Change-Id: I19a31f076e1813e367615bd377b424046ce144c7