am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for Android

* commit '86e0fcf830dcbada802ea2de22904e912dda5384':
  DO NOT MERGE Convert exit calls to abort for Android