Merge "Make LOCAL_SHORT_COMMANDS work on Darwin."