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

Change-Id: I9b80e01a56024a15e6007996f44d67917b6f7a7e