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

Change-Id: I815d8713a3ad4dc6e71afe83d901b7f5b84bff1f