Merge "libbinder: avoid re-registering callback"