Merge "Fix clang error about incompatible assignment in simg2simg.cpp"