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

* commit '716104b40df12d367cb5f649b92c6105d5978787':
  Fix crash reporting on x86 platform.