Merge "Switch frameworks/av/media/libmedia to the new icu."