Merge "ref: change binaryd flags from underscores to hyphens."