[automerger skipped] Merge "Switch host variant to using ICU direct" am: 73f136ec94
am: dfe26cd03a -s ours
am skip reason: change_id I55ff16556c2bd6f2d12b6cd39d732649b03be9c1 with SHA1 f59d42e557 is in history

Change-Id: Id0ae83917880203234b9b45908546828a5ddd64d