Merge "Don't use ICU when built for vendors" am: fc6bb576 am: ed6a0cb1 am: 52697317 am: dc3bc74d -s ours am: ac5167c4 -s ours Change-Id: I7e46f39b1fe3b8bbea5a74fd655b8466c2685b46