Merge "Use android::base::function_ref isntead of std::function"