Merge "Make libandroidicuinit visible only from external/icu"