Merge "[sf] Stop inheriting from std::unary_function" into udc-qpr-dev-plus-aosp