Merge "Revert "c2a: add option to use Cargo.toml.orig"" am: 3a293c7bba

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

Change-Id: Iaee11cd935a712fe5acec4de29aad42c7b76f8ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>