* Revert "Roll engine to 6473f1b106485cb0b4ea569af383173daeef8895 (#16032)"
This reverts commit 844ced010a.
* Revert "Let travis test archiving per commit too (#16004)"
This reverts commit df5905f382.
* iOS works
* Works on Android
* Take in commit number in iOS also. Get rid of image upload for Android. It's just a waste of bandwidth
* Tweak to fix on Travis