* java/awt/image/ColorModel.java: Re-merged with Classpath. * java/awt/image/ImageFilter.java: Likewise. From-SVN: r63024