Merge "Rewrite image type in CompilerOptions."