Merge "Revert "Update sqlite cflags"" am: 0a568fd586 am: d39faa7a94 am: e7c822c3f3 am: 748270c1cd

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

Change-Id: I14f9e463b6e98a80d7b041010b223e59fc3c33a9