Merge "Remove unused classes from com.android.internal.widget"