Merge "Remove unused ICU4C headers included in android.text"