Merge "libbinder: remove unused context variables"