am 8477a300: Merge "Switch to using shared over local code for initializing ICU"

* commit '8477a3005451f01e74d3262e76e4b67908daf16c':
  Switch to using shared over local code for initializing ICU