am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."

* commit '5c97c4e1b0a45e52f463eeef37cd672372644613':
  Remove hardcoded ICU & OpenSSL include paths.