Merge "Move image_classes_ to CompilerOptions."