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

Change-Id: I28867f495c1bf3ac016c4ea18056dc85cd041042