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

Change-Id: I68d2d57206abd8e25a2399ec9ee911efa118f837