Merge "Separate the ICU API from the android-non-updatable API"