Merge "Add --patch and --ignore-cargo-errors options" am: 87b2d90748 am: dfa38d0e80 am: 29b38022fe am: 24838d8627

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

Change-Id: I448459ca4c0aa33a7cf8c4f8e2854eef127366df