Merge "make car support lib and car-lib produce 1.7 builds" into nyc-car-dev