Merge "Remove hardcoded ICU include paths."