Merge "Fix the compilation issue with mksnapshot for x86 target"