Merge "Switch to use aicu/AIcu.h" am: 969975c53f
am: b5444262a4

Change-Id: Iea03af28416d01354ed2e55f05f9e700c2155419