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