Merge "Rename package to android.icu.* instead of com.android.ibm.icu.*."