[automerger skipped] Merge "Switch to use aicu/AIcu.h" am: 969975c53f am: b5444262a4
am: 04c875c30f -s ours
am skip reason: change_id Ibe1d5ffd50e5cce76b1b01788954dcfb4762b1c6 with SHA1 9447c68921 is in history

Change-Id: Ie95da4c5b71df15ac1d57de9b010aca93a672874