Merge "Separate icu4j from core-libart"
am: 4d22f2e7a0

Change-Id: I6e8fb5cd4cec0c52cd2dc7742cd37cafbf026531