Merge remote-tracking branch 'aosp/icu64' into aosp/master

Test: n/a
Change-Id: I141f85b140d04ec896dd396ea0fa315d53f73d63