am 771f5146: am 4c0b9e3d: Merge "Fix crash reporting on x86 platform."

* commit '771f5146893aa9bbc451aed78e61b3b18c1bc3b4':
  Fix crash reporting on x86 platform.