Merge "Fix imports in android.text package."