Merge "Don't use ICU when built for vendors" am: fc6bb57693
am: ed6a0cb1f1

Change-Id: Ic488129f7d38fd5a337f3d4bcb419ffc6660a7ae