Merge "Revert "Move core-icu4j into I18n APEX"" am: b7c90696f7 am: 976189458a am: 9161ab78a4 am: 13af14d603

Change-Id: I0e0f1bf853031d4eefd74383a4a3d59bc30cc11f