Merge "Move frameworks/base off private libcore.ICU API."