Merge "dont add vendor tools to PATH" into gingerbread