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

Change-Id: I1f2004db571421051bd781f254cf5cfed3bd305d
tree: fbd3d0254cadb3c110e8fbe321f6703d5c8dcb73
  1. android/
  2. dist/
  3. Android.bp
  4. CleanSpec.mk
  5. OWNERS
  6. README.version