Merge "Switch to use aicu/AIcu.h"