Merge "Use ICU in libandroidicu"
am: 995c3f5247

Change-Id: I22832314959e41f9ea949c2815edeb07f9130ef8