Merge "Adjust icc compiler options"