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

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

Change-Id: Ie9132e4692e788b5b7ab68e89c702861285889f4