Fix bug where a failure becomes success on x86. am: c60f22c30e
am: 1f6c41f150

* commit '1f6c41f150c600f064c1f60d5bdd19894ca73cc8':
  Fix bug where a failure becomes success on x86.