Merge "Revert "Update build with --device and apex"" am: 1efbabdc94

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

Change-Id: Idf3f0cba9f8699059c8d1db54a44f2b2328fcb0e