Merge "Revert "Move core-icu4j into I18n APEX"" am: b7c90696f7

Change-Id: Ie173b82279d75f1f5953d1ae17e139be774e1196