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

Change-Id: I12ede17ba6d3fa284a374d68c575f4994766874f