diff --git a/Android.bp b/Android.bp
index f1cb8a1..d75dab1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,6 +1,6 @@
 // This file is generated by cargo2android.py --run --device.
 
-rust_library_rlib {
+rust_library {
     name: "libbitflags",
     host_supported: true,
     crate_name: "bitflags",
diff --git a/src/lib.rs b/src/lib.rs
index 3929b02..7b01db0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -253,7 +253,7 @@
 #![no_std]
 #![doc(html_root_url = "https://docs.rs/bitflags/1.2.1")]
 
-#[cfg(test)]
+// ANDROID: Unconditionally use std to allow building as a dylib
 #[macro_use]
 extern crate std;