Merge "Make libandroidicuinit visible only from external/icu" am: 2d57dc7a11

Change-Id: I1e76a387fb855ef397eab5323245ba22ceb5413a