Merge changes from topic "updater-c2a-fixes"

* changes:
  Abort cargo2android.py if the patch fails.
  Raise an exception if we encountered an error.