am a3e0ada2: am 7c5fdf32: am 2c3e0af1: Merge "Add ICU jar to SDK" into jb-mr2-dev

* commit 'a3e0ada25bb5fbd34fe6ade783bdb61469871ab8':
  Add ICU jar to SDK