Merge "Update sqlite cflags" am: aad32b9f2d am: 269e407bb0 am: 396683ecf7

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

Change-Id: I8a53cfb4e4245058c84778b567b1087c76ec341d