Merge "Make Windows variant of libsqlite consistent with Linux+Mac" into main...

Merge "Make Windows variant of libsqlite consistent with Linux+Mac" into main am: cc692936 am: 50a4f167

Original change: https://android-review.googlesource.com/c/platform/external/sqlite/+/2881267



Change-Id: Icc64f26961c12c8fb2c7ddb6d0c65e604ea550c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>