Merge "Improve Android.bp" am: 2b84311aea am: d2c41c6094 am: 9223ff8027

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libsqlite3-sys/+/1806615

Change-Id: I893f61d8481fb640a07106a18366de55aa8ea1d9