[automerger skipped] Merge "Switch host variant to using ICU direct" am: 18663755e0 am: 32fec772f9 am: 8728e95771 am: 72ac6cf5b8 -s ours am skip reason: change_id Ie65aadc407d6c758fb8a1502a605fbbc7f460a83 with SHA1 5b6b2708db is in history Change-Id: I35408beedf4cebb738c05007b46a7701fa7f96e2