Merge "vendorsetup: add vendor/cyanogen/tools to PATH" into froyo