Merge "Switch host variant to using ICU direct"
am: 73f136ec94

Change-Id: I583b7fbdb82dca24780a1c5575d008b4803eba80