Merge "Use the new more inclusive command-line options." am: bf567243f5

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

Change-Id: I96a3d1c41b1e32e2d788d4f0c37d445bc749e980