Merge "Remove hardcoded ICU & OpenSSL include paths."