Merge "Use ICU in libandroidicu" am: bc132a8a68 am: db041fa025
am: 80ab28edd5

Change-Id: I08738c9b360f30d54f3c8fe93b288a9038cf6325