Revert^2 "Use std::function instead of base::function_ref"

84b7cff1a7082d32e9043014e57db7b4ed2aa7a0

Test: m
Bug: 302723053
Change-Id: If25bdb65254a4a8ad5afeda7e6ce1eedf422d896
9 files changed