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

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