[automerger skipped] Merge "Use ICU in libandroidicu" am: 851a571c58 am: d80c35a12d
am: 261822541b -s ours
am skip reason: change_id Ida6aac85dfb79bf8e7a3a2540e567ee211279e09 with SHA1 b6826d9e88 is in history

Change-Id: I25970934124d2c58fdce059850edaa21ad19854b