Merge "Eliminate ICU's .dat lookup from bionic"
am: 5569bc7d34

Change-Id: I07fff3c4b31a5db744fb0757bfe357e5dea5af9f