am da68f488: Merge "Fix the compilation issue with mksnapshot for x86 target"

* commit 'da68f488bd070bbfdbe1e9cb71f9912327db9ec0':
  Fix the compilation issue with mksnapshot for x86 target