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

Change-Id: Ie0063244130f9d0bf6984bba20ebeed9ab22532e