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 am: 525394f1

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



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