Merge "Use ICU in libandroidicu"
am: bc132a8a68

Change-Id: I1e5e17ce7437466af46fe94d819328e4a8d6be19