am c2c49272: (-s ours) am 86e0fcf8: DO NOT MERGE Convert exit calls to abort for Android

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