Merge "libbinder: servicemanagement errors"