Merge "binder: fix inconsistent-missing-override warning."