Merge "C++17: use android::base::Trim instead of std::not1/std::ptr_fun."