Merge "Fix import statements in android.widget package."