am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu."

* commit '3964ea46750cd5715f29ad4d9cada4a35208ad7a':
  Switch frameworks/base/libs/androidfw to the new icu.