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

Change-Id: I352e256d259c1615e4ee6f5f1153e94c48ed6e42