Merge remote-tracking branch 'aosp/icu64' into aosp/master am: 747b4bb9d5
am: 75212c91d0

Change-Id: Ia846df80b51ff9f0da8f98cea83beeed6938e879