Cherry pick 2 more patches from the upstream

They don't affect Chrome/Blink at the moment, but had better
be fixed now.

  http://www.icu-project.org/trac/ticket/12815
  http://www.icu-project.org/trac/ticket/12832

BUG=None

Review URL: https://codereview.chromium.org/2499493002 .
5 files changed