am df0d7637: (-s ours) Cherrypick http://bugs.icu-project.org/trac/changeset/37162. DO NOT MERGE

* commit 'df0d7637affa6f440cb7059e631d2e575c812aa6':
  Cherrypick http://bugs.icu-project.org/trac/changeset/37162. DO NOT MERGE
tree: 80222092c5ff7a3131518b44c44df00654753a45
  1. android_utils/
  2. icu4c/
  3. icu4j/
  4. Android.mk
  5. MODULE_LICENSE_BSD_LIKE
  6. NOTICE