Merge ""Move ICU into i18n APEX" Attempt 2" am: 450ac958fd

Change-Id: I6add80d59e17aa1bfd6cd3b2c461ae0a8138d23f