Merge "Remove unused com.android.internal.widget.Smileys class"