Merge "ico-vic-carsimulator: fix build" into tizen