Merge "binderwrapper: Resolve ambiguous base::Closure reference"