Merge "Add --patch and --ignore-cargo-errors options" am: 87b2d90748

Original change: https://android-review.googlesource.com/c/platform/development/+/1483304

Change-Id: Icc379ab7ea290072fcae31da8aa944f4b24f36b4