am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]

* commit 'b866a59170206edc25f33dca28ee7f037050cc7f':
  Add ICU jar to SDK [DO NOT MERGE]