Merge "Revert "Update sqlite cflags"" am: 0a568fd586 am: d39faa7a94

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

Change-Id: I371c93f45d7832d9c86b38b82e0699145d0dc00c