Merge "Require cargo_bin option" am: 9f75e2c9bc am: 65ba5606c1

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

Change-Id: I11eac63d2cc0bc11edb6b7a116cf1acd7f74a4d0