Merge "Generate apex_available from c2a instead of a patch" am: 3f3463b5ea am: afce7ce1a7 am: f7390452d8

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/untrusted/+/1690065

Change-Id: I38e2bbf9f65334a5a368284f0861887dc9db2b41