Merge "Migrate kitchen sink to car-lib, away from car-support-lib."